diff --git a/README.md b/README.md
index 743ce46c1..382c73513 100644
--- a/README.md
+++ b/README.md
@@ -244,6 +244,7 @@ Developer note: The software implements the [Torznab](https://github.com/Sonarr/
  * Superbits
  * Tasmanit
  * TBPlus
+ * TehConnection.me
  * TenYardTracker
  * The Empire
  * The Geeks
diff --git a/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs b/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs
index 115a66f3d..ed2e169c4 100644
--- a/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs
+++ b/src/Jackett.Common/Indexers/Abstract/GazelleTracker.cs
@@ -239,10 +239,40 @@ namespace Jackett.Common.Indexers.Abstract
             if (torrent["hasCue"] != null && (bool)torrent["hasCue"])
                 flags.Add("Cue");
 
+            // tehconnection.me specific?
+            var lang = (string)torrent["lang"];
+            if (!string.IsNullOrEmpty(lang) && lang != "---")
+                flags.Add(lang);
+
             var media = (string)torrent["media"];
             if (!string.IsNullOrEmpty(media))
                 flags.Add(media);
 
+            // tehconnection.me specific?
+            var resolution = (string)torrent["resolution"];
+            if (!string.IsNullOrEmpty(resolution))
+                flags.Add(resolution);
+
+            // tehconnection.me specific?
+            var container = (string)torrent["container"];
+            if (!string.IsNullOrEmpty(container))
+                flags.Add(container);
+
+            // tehconnection.me specific?
+            var codec = (string)torrent["codec"];
+            if (!string.IsNullOrEmpty(codec))
+                flags.Add(codec);
+
+            // tehconnection.me specific?
+            var audio = (string)torrent["audio"];
+            if (!string.IsNullOrEmpty(audio))
+                flags.Add(audio);
+
+            // tehconnection.me specific?
+            var subbing = (string)torrent["subbing"];
+            if (!string.IsNullOrEmpty(subbing) && subbing != "---")
+                flags.Add(subbing);
+
             if (torrent["remastered"] != null && (bool)torrent["remastered"])
             {
                 var remasterYear = (string)torrent["remasterYear"];
diff --git a/src/Jackett.Common/Indexers/TehConnectionMe.cs b/src/Jackett.Common/Indexers/TehConnectionMe.cs
new file mode 100644
index 000000000..be4447c80
--- /dev/null
+++ b/src/Jackett.Common/Indexers/TehConnectionMe.cs
@@ -0,0 +1,32 @@
+using System.Collections.Generic;
+using Jackett.Common.Indexers.Abstract;
+using Jackett.Common.Models;
+using Jackett.Common.Services.Interfaces;
+using Jackett.Common.Utils.Clients;
+using NLog;
+
+namespace Jackett.Common.Indexers
+{
+    public class TehConnectionMe : GazelleTracker
+    {
+        public TehConnectionMe(IIndexerConfigurationService configService, WebClient webClient, Logger logger, IProtectionService protectionService)
+            : base(name: "TehConnection.me",
+                desc: "A movies tracker",
+                link: "https://tehconnection.me/",
+                configService: configService,
+                logger: logger,
+                protectionService: protectionService,
+                webClient: webClient,
+                supportsFreeleechTokens: true
+                )
+        {
+            Language = "en-us";
+            Type = "private";
+
+            AddCategoryMapping(1, TorznabCatType.Movies, "Feature Film");
+            AddCategoryMapping(2, TorznabCatType.Movies, "Short Film");
+            AddCategoryMapping(3, TorznabCatType.Movies, "Miniseries");
+            AddCategoryMapping(4, TorznabCatType.Movies, "Other");
+        }
+    }
+}
\ No newline at end of file