diff --git a/programs/Makefile b/programs/Makefile
index 696ba17..7380ad2 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -7,7 +7,8 @@
 OFLAGS	= -O
 LDFLAGS	= -L../library -lpolarssl
 
-APPS =	aes/aescrypt2		hash/hello		\
+APPS =	aes/aescrypt2	aes/crypt_and_hash	\
+	hash/hello								\
 	hash/md5sum			hash/sha1sum		\
 	hash/sha2sum		pkey/dh_client		\
 	pkey/dh_genprime	pkey/dh_server		\
@@ -26,6 +27,10 @@
 	echo   "  CC    aes/aescrypt2.c"
 	$(CC) $(CFLAGS) $(OFLAGS) aes/aescrypt2.c    $(LDFLAGS) -o $@
 
+aes/crypt_and_hash: aes/crypt_and_hash.c ../library/libpolarssl.a
+	echo   "  CC    aes/crypt_and_hash.c"
+	$(CC) $(CFLAGS) $(OFLAGS) aes/crypt_and_hash.c $(LDFLAGS) -o $@
+
 hash/hello: hash/hello.c ../library/libpolarssl.a
 	echo   "  CC    hash/hello.c"
 	$(CC) $(CFLAGS) $(OFLAGS) hash/hello.c       $(LDFLAGS) -o $@