diff --git a/modules/Makefile.am b/modules/Makefile.am
index e863bb3..3a8db26 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1,5 +1,11 @@
 # $Id$
 
 SUBDIRS = pam_deny pam_permit
+
+if WITH_PAM_UNIX
 SUBDIRS += pam_unix
+endif
+
+if WITH_PAM_OATH
 SUBDIRS += pam_oath
+endif
diff --git a/modules/pam_oath/Makefile.am b/modules/pam_oath/Makefile.am
index 337f230..59e16b6 100644
--- a/modules/pam_oath/Makefile.am
+++ b/modules/pam_oath/Makefile.am
@@ -3,7 +3,6 @@
 pkglibdir = @OPENPAM_MODULES_DIR@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
-if WITH_PAM_OATH
 noinst_HEADERS = oath.h
 
 pkglib_LTLIBRARIES = pam_oath.la
@@ -14,5 +13,3 @@ pam_oath_la_SOURCES += oath_key.c
 pam_oath_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
 	-export-symbols-regex '^pam_sm_'
 pam_oath_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPTO_LIBS@
-
-endif
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index 78e3671..50b75d9 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -3,11 +3,9 @@
 pkglibdir = @OPENPAM_MODULES_DIR@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 
-if WITH_PAM_UNIX
 pkglib_LTLIBRARIES = pam_unix.la
 
 pam_unix_la_SOURCES = pam_unix.c
 pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
 	-export-symbols-regex '^pam_sm_'
 pam_unix_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPT_LIBS@
-endif