diff --git a/configure.in b/configure.in
index 4388bc414..b5f71b02a 100644
--- a/configure.in
+++ b/configure.in
@@ -1253,7 +1253,6 @@ AC_OUTPUT(
 	src/Makefile
 	src/include/Makefile
 	src/libstrongswan/Makefile
-	src/libstrongswan/checksum/Makefile
 	src/libstrongswan/plugins/aes/Makefile
 	src/libstrongswan/plugins/des/Makefile
 	src/libstrongswan/plugins/blowfish/Makefile
@@ -1318,6 +1317,7 @@ AC_OUTPUT(
 	src/libfast/Makefile
 	src/manager/Makefile
 	src/medsrv/Makefile
+	src/checksum/Makefile
 	scripts/Makefile
 	testing/Makefile
 )
diff --git a/src/Makefile.am b/src/Makefile.am
index 09eb13fe3..150a58a88 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,6 +44,10 @@ if USE_MEDSRV
   SUBDIRS += medsrv
 endif
 
+if USE_INTEGRITY_TEST
+  SUBDIRS += checksum
+endif
+
 EXTRA_DIST = strongswan.conf
 
 install-exec-local :	
diff --git a/src/libstrongswan/checksum/.gitignore b/src/checksum/.gitignore
similarity index 100%
rename from src/libstrongswan/checksum/.gitignore
rename to src/checksum/.gitignore
diff --git a/src/libstrongswan/checksum/Makefile.am b/src/checksum/Makefile.am
similarity index 100%
rename from src/libstrongswan/checksum/Makefile.am
rename to src/checksum/Makefile.am
diff --git a/src/libstrongswan/checksum/checksum_builder.c b/src/checksum/checksum_builder.c
similarity index 100%
rename from src/libstrongswan/checksum/checksum_builder.c
rename to src/checksum/checksum_builder.c
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 7f27b8b7d..096ef3b68 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -197,7 +197,3 @@ endif
 if USE_TEST_VECTORS
   SUBDIRS += plugins/test_vectors
 endif
-
-if USE_INTEGRITY_TEST
-  SUBDIRS += checksum
-endif