diff --git a/configure.ac b/configure.ac
index 59bc89fb3a..09ff17f038 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,7 @@ AC_CONFIG_FILES([Makefile
    src/libexpr/Makefile
    src/nix-instantiate/Makefile
    src/nix-env/Makefile
-   src/log2xml/Makefile
+   src/nix-log2xml/Makefile
    src/bsdiff-4.2/Makefile
    scripts/Makefile
    corepkgs/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 7753a77d49..3167105ffc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash \
- libexpr nix-instantiate nix-env log2xml bsdiff-4.2
+ libexpr nix-instantiate nix-env nix-log2xml bsdiff-4.2
 
 EXTRA_DIST = aterm-helper.pl
 
diff --git a/src/log2xml/Makefile.am b/src/nix-log2xml/Makefile.am
similarity index 100%
rename from src/log2xml/Makefile.am
rename to src/nix-log2xml/Makefile.am
diff --git a/src/log2xml/log2html.xsl b/src/nix-log2xml/log2html.xsl
similarity index 100%
rename from src/log2xml/log2html.xsl
rename to src/nix-log2xml/log2html.xsl
diff --git a/src/log2xml/log2xml.cc b/src/nix-log2xml/log2xml.cc
similarity index 100%
rename from src/log2xml/log2xml.cc
rename to src/nix-log2xml/log2xml.cc
diff --git a/src/log2xml/logfile.css b/src/nix-log2xml/logfile.css
similarity index 100%
rename from src/log2xml/logfile.css
rename to src/nix-log2xml/logfile.css
diff --git a/src/log2xml/mark-errors.xsl b/src/nix-log2xml/mark-errors.xsl
similarity index 100%
rename from src/log2xml/mark-errors.xsl
rename to src/nix-log2xml/mark-errors.xsl
diff --git a/src/log2xml/treebits.js b/src/nix-log2xml/treebits.js
similarity index 100%
rename from src/log2xml/treebits.js
rename to src/nix-log2xml/treebits.js