diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 84430998c..8e380156f 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES = libstrongswan.la
 
 libstrongswan_la_SOURCES = \
+asn1/oid.c asn1/oid.h \
 crypto/rsa/rsa_private_key.c crypto/rsa/rsa_public_key.h crypto/rsa/rsa_private_key.h crypto/rsa/rsa_public_key.c \
 crypto/prfs/hmac_prf.c crypto/prfs/hmac_prf.h crypto/prfs/prf.c crypto/prfs/prf.h crypto/signers/hmac_signer.c \
 crypto/signers/hmac_signer.h crypto/signers/signer.c crypto/signers/signer.h crypto/crypters/aes_cbc_crypter.c \
@@ -11,7 +12,7 @@ crypto/hmac.c crypto/x509.h crypto/hmac.h crypto/diffie_hellman.h utils/identifi
 utils/linked_list.c utils/linked_list.h utils/tester.c utils/leak_detective.c utils/logger_manager.c \
 utils/randomizer.c utils/tester.h utils/leak_detective.h utils/host.c utils/logger_manager.h utils/randomizer.h \
 utils/logger.c utils/host.h utils/logger.h utils/identification.c utils/lexparser.c utils/lexparser.h \
-asn1/ttodata.c asn1/oid.h asn1/ttodata.h asn1/pem.c asn1/asn1.c asn1/pem.h asn1/asn1.h asn1/oid.c definitions.h types.h \
+asn1/ttodata.c asn1/ttodata.h asn1/pem.c asn1/asn1.c asn1/pem.h asn1/asn1.h definitions.h types.h \
 definitions.c library.c types.c library.h 
 
 libstrongswan_la_LIBADD = -lgmp -lpthread
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 89d0a1a72..3409140c6 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -5,14 +5,14 @@
 ipsec_PROGRAMS = pluto _pluto_adns
 
 pluto_SOURCES = \
-linux26/rtnetlink.h linux26/xfrm.h linux26/netlink.h rsaref/pkcs11t.h rsaref/pkcs11.h \
+oid.c oid.h linux26/rtnetlink.h linux26/xfrm.h linux26/netlink.h rsaref/pkcs11t.h rsaref/pkcs11.h \
 rsaref/unix.h rsaref/pkcs11f.h alg/ike_alg_twofish.c alg/ike_alg_aes.c alg/ike_alg_blowfish.c \
 alg/ike_alg_sha2.c alg/ike_alg_serpent.c alg/ike_alginit.c kernel_alg.c kernel_alg.h kernel_pfkey.h \
 kernel_pfkey.c gcryptfix.c gcryptfix.h primegen.c smallprime.c ocsp.c ocsp.h pgp.c ac.c certs.c \
 connections.c certs.h virtual.c connections.h fetch.c virtual.h fetch.h ipsec_doi.c ipsec_doi.h \
 x509.c kameipsec.h cookie.c x509.h cookie.h pgp.h ac.h sha1.c sha1.h constants.c smartcard.c \
 kernel.c constants.h smartcard.h kernel.h dnskey.c asn1.c dnskey.h elgamal.c db_ops.c asn1.h \
-elgamal.h oid.c db_ops.h mp_defs.c state.c oid.h mp_defs.h ca.c state.h pkcs7.c lex.c ca.h \
+elgamal.h db_ops.h mp_defs.c state.c mp_defs.h ca.c state.h pkcs7.c lex.c ca.h \
 pkcs7.h id.c lex.h id.h keys.c ike_alg.c keys.h md5.c md5.h kernel_noklips.c ike_alg.h rcv_whack.c \
 rcv_whack.h alg_info.c alg_info.h pem.c kernel_noklips.h foodgroups.c pem.h kernel_netlink.c \
 foodgroups.h vendor.c vendor.h packet.c packet.h crl.c md2.c rnd.c crl.h md2.h spdb.c rnd.h \
@@ -35,10 +35,10 @@ DISTCLEANFILES = oid.c oid.h
 # TODO: get perl from ./configure
 PERL=perl
 
-oid.c: oid.txt oid.pl
+oid.c:	oid.txt oid.pl
 	$(PERL) oid.pl
 
-oid.h: oid.txt oid.pl
+oid.h:	oid.txt oid.pl
 	$(PERL) oid.pl
 
 # This compile option activates dynamic URL fetching using libcurl