diff --git a/Makefile.am b/Makefile.am
index 6bf32b479f21186729b8d87c99759ae3e1e844fe..0e40abf87ee4dfb3c39ee5cb58b45e6a6d990441 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,8 @@ libnettle_a_SOURCES = aes.c aes.h aes-internal.h \
 		      rsa.h rsa.c rsa_md5.c rsa_sha1.c \
 		      rsa-encrypt.c rsa-decrypt.c \
 		      rsa-keygen.c rsa-compat.h rsa-compat.c \
-		      nettle-internal.c nettle-internal.h nettle-meta.h
+		      nettle-meta.h \
+		      nettle-internal.c nettle-internal.h nettle-openssl.c
 
 libnettle_a_LIBADD = @LIBOBJS@
 
@@ -61,7 +62,7 @@ RM_TMP = rm -f
 
 # FIXME: How to write this without using GNU make features?
 %.o: %.asm asm.m4 machine.m4 config.m4 
-	$(M4) $(srcdir)/asm.m4 $(srcdir)/machine.m4 config.m4 \
+	$(M4) $(srcdir)/asm.m4 machine.m4 config.m4 \
 		`test -f $< || echo '$(srcdir)/'`$< >tmp-$*.s
 	$(COMPILE) -c tmp-$*.s -o $@
 	$(RM_TMP) tmp-$*.s