diff --git a/configure.ac b/configure.ac
index 1fa6e1d33f1e55ccd17a39a24de9b50289c20d86..09e292e1b16f925560a65a81164d6c888c4ac432 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_CONFIG_FILES([Makefile
    src/libmain/Makefile
    src/nix-store/Makefile
    src/nix-hash/Makefile
-   src/nix-instantiate/Makefile
+   src/libexpr/Makefile
    scripts/Makefile
    corepkgs/Makefile
    corepkgs/fetchurl/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f2aafcdba6d1319de2d7fdb0b28de91afae7107..f06bb1f1d818e65a99aa573c04c59bc081a92dab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash nix-instantiate
+SUBDIRS = bin2c boost libutil libstore libmain nix-store nix-hash \
+ libexpr #nix-instantiate
diff --git a/src/nix-instantiate/Makefile.am b/src/libexpr/Makefile.am
similarity index 100%
rename from src/nix-instantiate/Makefile.am
rename to src/libexpr/Makefile.am
diff --git a/src/nix-instantiate/eval.cc b/src/libexpr/eval.cc
similarity index 100%
rename from src/nix-instantiate/eval.cc
rename to src/libexpr/eval.cc
diff --git a/src/nix-instantiate/eval.hh b/src/libexpr/eval.hh
similarity index 100%
rename from src/nix-instantiate/eval.hh
rename to src/libexpr/eval.hh
diff --git a/src/nix-instantiate/fix-expr.cc b/src/libexpr/fix-expr.cc
similarity index 100%
rename from src/nix-instantiate/fix-expr.cc
rename to src/libexpr/fix-expr.cc
diff --git a/src/nix-instantiate/fix-expr.hh b/src/libexpr/fix-expr.hh
similarity index 100%
rename from src/nix-instantiate/fix-expr.hh
rename to src/libexpr/fix-expr.hh
diff --git a/src/nix-instantiate/main.cc b/src/libexpr/main.cc
similarity index 100%
rename from src/nix-instantiate/main.cc
rename to src/libexpr/main.cc
diff --git a/src/nix-instantiate/nix.sdf b/src/libexpr/nix.sdf
similarity index 100%
rename from src/nix-instantiate/nix.sdf
rename to src/libexpr/nix.sdf
diff --git a/src/nix-instantiate/nixexpr.cc b/src/libexpr/nixexpr.cc
similarity index 100%
rename from src/nix-instantiate/nixexpr.cc
rename to src/libexpr/nixexpr.cc
diff --git a/src/nix-instantiate/nixexpr.hh b/src/libexpr/nixexpr.hh
similarity index 100%
rename from src/nix-instantiate/nixexpr.hh
rename to src/libexpr/nixexpr.hh
diff --git a/src/nix-instantiate/parser.cc b/src/libexpr/parser.cc
similarity index 100%
rename from src/nix-instantiate/parser.cc
rename to src/libexpr/parser.cc
diff --git a/src/nix-instantiate/parser.hh b/src/libexpr/parser.hh
similarity index 100%
rename from src/nix-instantiate/parser.hh
rename to src/libexpr/parser.hh
diff --git a/src/nix-instantiate/primops.cc b/src/libexpr/primops.cc
similarity index 100%
rename from src/nix-instantiate/primops.cc
rename to src/libexpr/primops.cc
diff --git a/src/nix-instantiate/primops.hh b/src/libexpr/primops.hh
similarity index 100%
rename from src/nix-instantiate/primops.hh
rename to src/libexpr/primops.hh