diff --git a/default.nix b/default.nix
index d6b4b47..68ad559 100644
--- a/default.nix
+++ b/default.nix
@@ -29,6 +29,12 @@ stdenv.mkDerivation {
       $(pkg-config --libs nix-store) \
       -lsqlite3 -lgc
 
+    g++ -g ${./index-debuginfo.cc} -Wall -std=c++14 -o $out/bin/index-debuginfo -I . \
+      $(pkg-config --cflags nix-main) \
+      $(pkg-config --libs nix-main) \
+      $(pkg-config --libs nix-store) \
+      -lsqlite3
+
     cp ${./mirror-nixos-branch.pl} $out/bin/mirror-nixos-branch
     wrapProgram $out/bin/mirror-nixos-branch --set PERL5LIB $PERL5LIB --prefix PATH : ${wget}/bin:${git}/bin:${nix}/bin:${gnutar}/bin:${xz}/bin:$out/bin
 
diff --git a/index-debuginfo.cc b/index-debuginfo.cc
new file mode 100644
index 0000000..33f26f6
--- /dev/null
+++ b/index-debuginfo.cc
@@ -0,0 +1,98 @@
+#include <nix/config.h>
+
+#include <regex>
+
+#include "shared.hh"
+#include "s3-binary-cache-store.hh"
+#include "thread-pool.hh"
+#include "nar-info.hh"
+
+#include "file-cache.hh"
+
+// cache.nixos.org/debuginfo/<build-id>
+//  => redirect to NAR
+
+using namespace nix;
+
+void mainWrapped(int argc, char * * argv)
+{
+    initNix();
+
+    if (argc != 4) throw Error("usage: index-debuginfo CACHE-DB BINARY-CACHE-URI STORE-PATHS");
+
+    Path cacheDbPath = argv[1];
+    std::string binaryCacheUri = argv[2];
+    Path storePathsFile = argv[3];
+
+    FileCache fileCache(cacheDbPath);
+
+    if (hasSuffix(binaryCacheUri, "/")) binaryCacheUri.pop_back();
+    auto binaryCache = openStore(binaryCacheUri).cast<S3BinaryCacheStore>();
+
+    auto storePaths = tokenizeString<PathSet>(readFile(storePathsFile, true));
+
+    std::regex debugFileRegex("^lib/debug/\\.build-id/[0-9a-f]{2}/[0-9a-f]{38}\\.debug$");
+
+    ThreadPool threadPool(25);
+
+    auto doFile = [&](std::string member, std::string key, std::string target) {
+        checkInterrupt();
+
+        nlohmann::json json;
+        json["archive"] = target;
+        json["member"] = member;
+
+        // FIXME: or should we overwrite? The previous link may point
+        // to a GC'ed file, so overwriting might be useful...
+        if (binaryCache->fileExists(key)) return;
+
+        printError("redirecting ‘%s’ to ‘%s’", key, target);
+
+        binaryCache->upsertFile(key, json.dump(), "application/json");
+    };
+
+    auto doPath = [&](const Path & storePath) {
+        checkInterrupt();
+
+        try {
+            auto files = fileCache.getFiles(binaryCache, storePath);
+
+            std::string prefix = "lib/debug/.build-id/";
+
+            for (auto & file : files) {
+                if (file.second.type != FSAccessor::Type::tRegular
+                    || !std::regex_match(file.first, debugFileRegex))
+                    continue;
+
+                std::string buildId =
+                    std::string(file.first, prefix.size(), 2)  +
+                    std::string(file.first, prefix.size() + 3, 38);
+
+                auto info = binaryCache->queryPathInfo(storePath).cast<const NarInfo>();
+
+                assert(hasPrefix(info->url, "nar/"));
+
+                std::string key = "debuginfo/" + buildId;
+                std::string target = "../" + info->url;
+
+                threadPool.enqueue(std::bind(doFile, file.first, key, target));
+            }
+
+        } catch (BadJSON & e) {
+            printError("error: in %s: %s", storePath, e.what());
+        }
+    };
+
+    for (auto & storePath : storePaths)
+        if (hasSuffix(storePath, "-debug"))
+            threadPool.enqueue(std::bind(doPath, storePath));
+
+    threadPool.process();
+}
+
+int main(int argc, char * * argv)
+{
+    return handleExceptions(argv[0], [&]() {
+        mainWrapped(argc, argv);
+    });
+}