diff --git a/extras/kdf/Makefile b/extras/kdf/Makefile
new file mode 100644
index 0000000..188e5f3
--- /dev/null
+++ b/extras/kdf/Makefile
@@ -0,0 +1,9 @@
+
+all:
+	gcc -O2 -o tomb-kdb-pbkdf2 pbkdf2.c -lgcrypt
+	gcc -O2 -o tomb-kdb-pbkdf2-getiter benchmark.c -lgcrypt
+	gcc -O2 -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
+	gcc -O2 -o hexencode hexencode.c
+
+clean:
+	rm -f tomb-kdb-pbkdf2-getiter tomb-kdb-pbkdf2 tomb-kdb-pbkdf2-gensalt hexencode
\ No newline at end of file
diff --git a/extras/kdf/Makefile.am b/extras/kdf/Makefile.am
deleted file mode 100644
index 8431faa..0000000
--- a/extras/kdf/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-if GCRYPT
-gcrypt_needing_programs = tomb-kdf-pbkdf2 tomb-kdf-pbkdf2-getiter
-else
-gcrypt_needing_programs=
-endif
-	
-
-bin_PROGRAMS = $(gcrypt_needing_programs) tomb-kdf-pbkdf2-gensalt hexencode
-tomb_kdf_pbkdf2_SOURCES = pbkdf2/pbkdf2.c
-tomb_kdf_pbkdf2_CFLAGS = $(LIBGCRYPT_CFLAGS)
-tomb_kdf_pbkdf2_LDADD = $(LIBGCRYPT_LIBS)
-
-tomb_kdf_pbkdf2_gensalt_SOURCES = pbkdf2/gen_salt.c
-
-tomb_kdf_pbkdf2_getiter_SOURCES = pbkdf2/benchmark.c
-tomb_kdf_pbkdf2_getiter_CFLAGS = $(LIBGCRYPT_CFLAGS)
-tomb_kdf_pbkdf2_getiter_LDADD = $(LIBGCRYPT_LIBS)
-
-hexencode_SOURCES = hexencode.c
-
diff --git a/extras/kdf/README b/extras/kdf/README
index 2ec8a09..0bb468e 100644
--- a/extras/kdf/README
+++ b/extras/kdf/README
@@ -1,3 +1,12 @@
+
+BUILD
+------
+
+Just type make.
+You need a recent development version of libgcrypt installed.
+On Debian 7 (not earlier) the libgcrypt11-dev package works:
+ # apt-get install libgcrypt11-dev
+
 PLANS
 ------
 
diff --git a/extras/kdf/pbkdf2/benchmark.c b/extras/kdf/benchmark.c
similarity index 100%
rename from extras/kdf/pbkdf2/benchmark.c
rename to extras/kdf/benchmark.c
diff --git a/extras/kdf/pbkdf2/gen_salt.c b/extras/kdf/gen_salt.c
similarity index 100%
rename from extras/kdf/pbkdf2/gen_salt.c
rename to extras/kdf/gen_salt.c
diff --git a/extras/kdf/pbkdf2/pbkdf2.c b/extras/kdf/pbkdf2.c
similarity index 100%
rename from extras/kdf/pbkdf2/pbkdf2.c
rename to extras/kdf/pbkdf2.c