diff --git a/Makefile.am b/Makefile.am
index 5c4fbf3f0a2a..8e236a7163a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib bin modules include
+SUBDIRS = lib/libpam bin modules include
 
 if WITH_DOC
 SUBDIRS += doc
diff --git a/bin/openpam_dump_policy/Makefile.am b/bin/openpam_dump_policy/Makefile.am
index a5fda16068bf..2af2eaf3036f 100644
--- a/bin/openpam_dump_policy/Makefile.am
+++ b/bin/openpam_dump_policy/Makefile.am
@@ -1,7 +1,7 @@
 # $Id: Makefile.am 538 2012-03-31 17:04:29Z des $
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
 
 noinst_PROGRAMS = openpam_dump_policy
 openpam_dump_policy_SOURCES = openpam_dump_policy.c
-openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam.la
+openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/bin/pamtest/Makefile.am b/bin/pamtest/Makefile.am
index 80694def17a4..943872c2699b 100644
--- a/bin/pamtest/Makefile.am
+++ b/bin/pamtest/Makefile.am
@@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = pamtest
 pamtest_SOURCES = pamtest.c
-pamtest_LDADD = $(top_builddir)/lib/libpam.la
+pamtest_LDADD = $(top_builddir)/lib/libpam/libpam.la
 
 dist_man1_MANS = pamtest.1
diff --git a/bin/su/Makefile.am b/bin/su/Makefile.am
index 50f0cb986e45..b0462c8c0e43 100644
--- a/bin/su/Makefile.am
+++ b/bin/su/Makefile.am
@@ -4,6 +4,6 @@ INCLUDES = -I$(top_srcdir)/include
 
 bin_PROGRAMS = su
 su_SOURCES = su.c
-su_LDADD = $(top_builddir)/lib/libpam.la
+su_LDADD = $(top_builddir)/lib/libpam/libpam.la
 
 dist_man1_MANS = su.1
diff --git a/configure.ac b/configure.ac
index fb30726a4d1b..4abd34d6f11b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl $Id: configure.ac 610 2012-05-26 14:03:45Z des $
 AC_PREREQ([2.62])
 AC_REVISION([$Id: configure.ac 610 2012-05-26 14:03:45Z des $])
 AC_INIT([OpenPAM], [20120526], [des@des.no])
-AC_CONFIG_SRCDIR([lib/pam_start.c])
+AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER([config.h])
@@ -119,7 +119,7 @@ AC_CONFIG_FILES([
     doc/man/Makefile
     include/Makefile
     include/security/Makefile
-    lib/Makefile
+    lib/libpam/Makefile
     modules/Makefile
     modules/pam_deny/Makefile
     modules/pam_permit/Makefile
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 4062a54d54fb..947710a7a5c5 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -73,7 +73,7 @@ CLEANFILES = $(ALLCMAN) openpam.3 pam.3
 
 GENDOC = $(top_srcdir)/misc/gendoc.pl
 
-LIBSRCDIR = $(top_srcdir)/lib
+LIBSRCDIR = $(top_srcdir)/lib/libpam
 
 VPATH = $(LIBSRCDIR) $(srcdir)
 
diff --git a/lib/Makefile.am b/lib/libpam/Makefile.am
similarity index 100%
rename from lib/Makefile.am
rename to lib/libpam/Makefile.am
diff --git a/lib/Makefile.in b/lib/libpam/Makefile.in
similarity index 100%
rename from lib/Makefile.in
rename to lib/libpam/Makefile.in
diff --git a/lib/openpam_borrow_cred.c b/lib/libpam/openpam_borrow_cred.c
similarity index 100%
rename from lib/openpam_borrow_cred.c
rename to lib/libpam/openpam_borrow_cred.c
diff --git a/lib/openpam_check_owner_perms.c b/lib/libpam/openpam_check_owner_perms.c
similarity index 100%
rename from lib/openpam_check_owner_perms.c
rename to lib/libpam/openpam_check_owner_perms.c
diff --git a/lib/openpam_configure.c b/lib/libpam/openpam_configure.c
similarity index 100%
rename from lib/openpam_configure.c
rename to lib/libpam/openpam_configure.c
diff --git a/lib/openpam_constants.c b/lib/libpam/openpam_constants.c
similarity index 100%
rename from lib/openpam_constants.c
rename to lib/libpam/openpam_constants.c
diff --git a/lib/openpam_constants.h b/lib/libpam/openpam_constants.h
similarity index 100%
rename from lib/openpam_constants.h
rename to lib/libpam/openpam_constants.h
diff --git a/lib/openpam_ctype.h b/lib/libpam/openpam_ctype.h
similarity index 100%
rename from lib/openpam_ctype.h
rename to lib/libpam/openpam_ctype.h
diff --git a/lib/openpam_debug.h b/lib/libpam/openpam_debug.h
similarity index 100%
rename from lib/openpam_debug.h
rename to lib/libpam/openpam_debug.h
diff --git a/lib/openpam_dispatch.c b/lib/libpam/openpam_dispatch.c
similarity index 100%
rename from lib/openpam_dispatch.c
rename to lib/libpam/openpam_dispatch.c
diff --git a/lib/openpam_dynamic.c b/lib/libpam/openpam_dynamic.c
similarity index 100%
rename from lib/openpam_dynamic.c
rename to lib/libpam/openpam_dynamic.c
diff --git a/lib/openpam_features.c b/lib/libpam/openpam_features.c
similarity index 100%
rename from lib/openpam_features.c
rename to lib/libpam/openpam_features.c
diff --git a/lib/openpam_features.h b/lib/libpam/openpam_features.h
similarity index 100%
rename from lib/openpam_features.h
rename to lib/libpam/openpam_features.h
diff --git a/lib/openpam_findenv.c b/lib/libpam/openpam_findenv.c
similarity index 100%
rename from lib/openpam_findenv.c
rename to lib/libpam/openpam_findenv.c
diff --git a/lib/openpam_free_data.c b/lib/libpam/openpam_free_data.c
similarity index 100%
rename from lib/openpam_free_data.c
rename to lib/libpam/openpam_free_data.c
diff --git a/lib/openpam_free_envlist.c b/lib/libpam/openpam_free_envlist.c
similarity index 100%
rename from lib/openpam_free_envlist.c
rename to lib/libpam/openpam_free_envlist.c
diff --git a/lib/openpam_get_feature.c b/lib/libpam/openpam_get_feature.c
similarity index 100%
rename from lib/openpam_get_feature.c
rename to lib/libpam/openpam_get_feature.c
diff --git a/lib/openpam_get_option.c b/lib/libpam/openpam_get_option.c
similarity index 100%
rename from lib/openpam_get_option.c
rename to lib/libpam/openpam_get_option.c
diff --git a/lib/openpam_impl.h b/lib/libpam/openpam_impl.h
similarity index 100%
rename from lib/openpam_impl.h
rename to lib/libpam/openpam_impl.h
diff --git a/lib/openpam_load.c b/lib/libpam/openpam_load.c
similarity index 100%
rename from lib/openpam_load.c
rename to lib/libpam/openpam_load.c
diff --git a/lib/openpam_log.c b/lib/libpam/openpam_log.c
similarity index 100%
rename from lib/openpam_log.c
rename to lib/libpam/openpam_log.c
diff --git a/lib/openpam_nullconv.c b/lib/libpam/openpam_nullconv.c
similarity index 100%
rename from lib/openpam_nullconv.c
rename to lib/libpam/openpam_nullconv.c
diff --git a/lib/openpam_readline.c b/lib/libpam/openpam_readline.c
similarity index 100%
rename from lib/openpam_readline.c
rename to lib/libpam/openpam_readline.c
diff --git a/lib/openpam_readlinev.c b/lib/libpam/openpam_readlinev.c
similarity index 100%
rename from lib/openpam_readlinev.c
rename to lib/libpam/openpam_readlinev.c
diff --git a/lib/openpam_readword.c b/lib/libpam/openpam_readword.c
similarity index 100%
rename from lib/openpam_readword.c
rename to lib/libpam/openpam_readword.c
diff --git a/lib/openpam_restore_cred.c b/lib/libpam/openpam_restore_cred.c
similarity index 100%
rename from lib/openpam_restore_cred.c
rename to lib/libpam/openpam_restore_cred.c
diff --git a/lib/openpam_set_feature.c b/lib/libpam/openpam_set_feature.c
similarity index 100%
rename from lib/openpam_set_feature.c
rename to lib/libpam/openpam_set_feature.c
diff --git a/lib/openpam_set_option.c b/lib/libpam/openpam_set_option.c
similarity index 100%
rename from lib/openpam_set_option.c
rename to lib/libpam/openpam_set_option.c
diff --git a/lib/openpam_static.c b/lib/libpam/openpam_static.c
similarity index 100%
rename from lib/openpam_static.c
rename to lib/libpam/openpam_static.c
diff --git a/lib/openpam_straddch.c b/lib/libpam/openpam_straddch.c
similarity index 100%
rename from lib/openpam_straddch.c
rename to lib/libpam/openpam_straddch.c
diff --git a/lib/openpam_strlcat.h b/lib/libpam/openpam_strlcat.h
similarity index 100%
rename from lib/openpam_strlcat.h
rename to lib/libpam/openpam_strlcat.h
diff --git a/lib/openpam_strlcmp.h b/lib/libpam/openpam_strlcmp.h
similarity index 100%
rename from lib/openpam_strlcmp.h
rename to lib/libpam/openpam_strlcmp.h
diff --git a/lib/openpam_strlcpy.h b/lib/libpam/openpam_strlcpy.h
similarity index 100%
rename from lib/openpam_strlcpy.h
rename to lib/libpam/openpam_strlcpy.h
diff --git a/lib/openpam_subst.c b/lib/libpam/openpam_subst.c
similarity index 100%
rename from lib/openpam_subst.c
rename to lib/libpam/openpam_subst.c
diff --git a/lib/openpam_ttyconv.c b/lib/libpam/openpam_ttyconv.c
similarity index 100%
rename from lib/openpam_ttyconv.c
rename to lib/libpam/openpam_ttyconv.c
diff --git a/lib/pam_acct_mgmt.c b/lib/libpam/pam_acct_mgmt.c
similarity index 100%
rename from lib/pam_acct_mgmt.c
rename to lib/libpam/pam_acct_mgmt.c
diff --git a/lib/pam_authenticate.c b/lib/libpam/pam_authenticate.c
similarity index 100%
rename from lib/pam_authenticate.c
rename to lib/libpam/pam_authenticate.c
diff --git a/lib/pam_authenticate_secondary.c b/lib/libpam/pam_authenticate_secondary.c
similarity index 100%
rename from lib/pam_authenticate_secondary.c
rename to lib/libpam/pam_authenticate_secondary.c
diff --git a/lib/pam_chauthtok.c b/lib/libpam/pam_chauthtok.c
similarity index 100%
rename from lib/pam_chauthtok.c
rename to lib/libpam/pam_chauthtok.c
diff --git a/lib/pam_close_session.c b/lib/libpam/pam_close_session.c
similarity index 100%
rename from lib/pam_close_session.c
rename to lib/libpam/pam_close_session.c
diff --git a/lib/pam_end.c b/lib/libpam/pam_end.c
similarity index 100%
rename from lib/pam_end.c
rename to lib/libpam/pam_end.c
diff --git a/lib/pam_error.c b/lib/libpam/pam_error.c
similarity index 100%
rename from lib/pam_error.c
rename to lib/libpam/pam_error.c
diff --git a/lib/pam_get_authtok.c b/lib/libpam/pam_get_authtok.c
similarity index 100%
rename from lib/pam_get_authtok.c
rename to lib/libpam/pam_get_authtok.c
diff --git a/lib/pam_get_data.c b/lib/libpam/pam_get_data.c
similarity index 100%
rename from lib/pam_get_data.c
rename to lib/libpam/pam_get_data.c
diff --git a/lib/pam_get_item.c b/lib/libpam/pam_get_item.c
similarity index 100%
rename from lib/pam_get_item.c
rename to lib/libpam/pam_get_item.c
diff --git a/lib/pam_get_mapped_authtok.c b/lib/libpam/pam_get_mapped_authtok.c
similarity index 100%
rename from lib/pam_get_mapped_authtok.c
rename to lib/libpam/pam_get_mapped_authtok.c
diff --git a/lib/pam_get_mapped_username.c b/lib/libpam/pam_get_mapped_username.c
similarity index 100%
rename from lib/pam_get_mapped_username.c
rename to lib/libpam/pam_get_mapped_username.c
diff --git a/lib/pam_get_user.c b/lib/libpam/pam_get_user.c
similarity index 100%
rename from lib/pam_get_user.c
rename to lib/libpam/pam_get_user.c
diff --git a/lib/pam_getenv.c b/lib/libpam/pam_getenv.c
similarity index 100%
rename from lib/pam_getenv.c
rename to lib/libpam/pam_getenv.c
diff --git a/lib/pam_getenvlist.c b/lib/libpam/pam_getenvlist.c
similarity index 100%
rename from lib/pam_getenvlist.c
rename to lib/libpam/pam_getenvlist.c
diff --git a/lib/pam_info.c b/lib/libpam/pam_info.c
similarity index 100%
rename from lib/pam_info.c
rename to lib/libpam/pam_info.c
diff --git a/lib/pam_open_session.c b/lib/libpam/pam_open_session.c
similarity index 100%
rename from lib/pam_open_session.c
rename to lib/libpam/pam_open_session.c
diff --git a/lib/pam_prompt.c b/lib/libpam/pam_prompt.c
similarity index 100%
rename from lib/pam_prompt.c
rename to lib/libpam/pam_prompt.c
diff --git a/lib/pam_putenv.c b/lib/libpam/pam_putenv.c
similarity index 100%
rename from lib/pam_putenv.c
rename to lib/libpam/pam_putenv.c
diff --git a/lib/pam_set_data.c b/lib/libpam/pam_set_data.c
similarity index 100%
rename from lib/pam_set_data.c
rename to lib/libpam/pam_set_data.c
diff --git a/lib/pam_set_item.c b/lib/libpam/pam_set_item.c
similarity index 100%
rename from lib/pam_set_item.c
rename to lib/libpam/pam_set_item.c
diff --git a/lib/pam_set_mapped_authtok.c b/lib/libpam/pam_set_mapped_authtok.c
similarity index 100%
rename from lib/pam_set_mapped_authtok.c
rename to lib/libpam/pam_set_mapped_authtok.c
diff --git a/lib/pam_set_mapped_username.c b/lib/libpam/pam_set_mapped_username.c
similarity index 100%
rename from lib/pam_set_mapped_username.c
rename to lib/libpam/pam_set_mapped_username.c
diff --git a/lib/pam_setcred.c b/lib/libpam/pam_setcred.c
similarity index 100%
rename from lib/pam_setcred.c
rename to lib/libpam/pam_setcred.c
diff --git a/lib/pam_setenv.c b/lib/libpam/pam_setenv.c
similarity index 100%
rename from lib/pam_setenv.c
rename to lib/libpam/pam_setenv.c
diff --git a/lib/pam_sm_acct_mgmt.c b/lib/libpam/pam_sm_acct_mgmt.c
similarity index 100%
rename from lib/pam_sm_acct_mgmt.c
rename to lib/libpam/pam_sm_acct_mgmt.c
diff --git a/lib/pam_sm_authenticate.c b/lib/libpam/pam_sm_authenticate.c
similarity index 100%
rename from lib/pam_sm_authenticate.c
rename to lib/libpam/pam_sm_authenticate.c
diff --git a/lib/pam_sm_authenticate_secondary.c b/lib/libpam/pam_sm_authenticate_secondary.c
similarity index 100%
rename from lib/pam_sm_authenticate_secondary.c
rename to lib/libpam/pam_sm_authenticate_secondary.c
diff --git a/lib/pam_sm_chauthtok.c b/lib/libpam/pam_sm_chauthtok.c
similarity index 100%
rename from lib/pam_sm_chauthtok.c
rename to lib/libpam/pam_sm_chauthtok.c
diff --git a/lib/pam_sm_close_session.c b/lib/libpam/pam_sm_close_session.c
similarity index 100%
rename from lib/pam_sm_close_session.c
rename to lib/libpam/pam_sm_close_session.c
diff --git a/lib/pam_sm_get_mapped_authtok.c b/lib/libpam/pam_sm_get_mapped_authtok.c
similarity index 100%
rename from lib/pam_sm_get_mapped_authtok.c
rename to lib/libpam/pam_sm_get_mapped_authtok.c
diff --git a/lib/pam_sm_get_mapped_username.c b/lib/libpam/pam_sm_get_mapped_username.c
similarity index 100%
rename from lib/pam_sm_get_mapped_username.c
rename to lib/libpam/pam_sm_get_mapped_username.c
diff --git a/lib/pam_sm_open_session.c b/lib/libpam/pam_sm_open_session.c
similarity index 100%
rename from lib/pam_sm_open_session.c
rename to lib/libpam/pam_sm_open_session.c
diff --git a/lib/pam_sm_set_mapped_authtok.c b/lib/libpam/pam_sm_set_mapped_authtok.c
similarity index 100%
rename from lib/pam_sm_set_mapped_authtok.c
rename to lib/libpam/pam_sm_set_mapped_authtok.c
diff --git a/lib/pam_sm_set_mapped_username.c b/lib/libpam/pam_sm_set_mapped_username.c
similarity index 100%
rename from lib/pam_sm_set_mapped_username.c
rename to lib/libpam/pam_sm_set_mapped_username.c
diff --git a/lib/pam_sm_setcred.c b/lib/libpam/pam_sm_setcred.c
similarity index 100%
rename from lib/pam_sm_setcred.c
rename to lib/libpam/pam_sm_setcred.c
diff --git a/lib/pam_start.c b/lib/libpam/pam_start.c
similarity index 100%
rename from lib/pam_start.c
rename to lib/libpam/pam_start.c
diff --git a/lib/pam_strerror.c b/lib/libpam/pam_strerror.c
similarity index 100%
rename from lib/pam_strerror.c
rename to lib/libpam/pam_strerror.c
diff --git a/lib/pam_verror.c b/lib/libpam/pam_verror.c
similarity index 100%
rename from lib/pam_verror.c
rename to lib/libpam/pam_verror.c
diff --git a/lib/pam_vinfo.c b/lib/libpam/pam_vinfo.c
similarity index 100%
rename from lib/pam_vinfo.c
rename to lib/libpam/pam_vinfo.c
diff --git a/lib/pam_vprompt.c b/lib/libpam/pam_vprompt.c
similarity index 100%
rename from lib/pam_vprompt.c
rename to lib/libpam/pam_vprompt.c
diff --git a/modules/pam_deny/Makefile.am b/modules/pam_deny/Makefile.am
index d432915cc50e..ae6f59b69e85 100644
--- a/modules/pam_deny/Makefile.am
+++ b/modules/pam_deny/Makefile.am
@@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_deny.la
 
 pam_deny_la_SOURCES = pam_deny.c
 pam_deny_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_deny_la_LIBADD = $(top_builddir)/lib/libpam.la
+pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/modules/pam_permit/Makefile.am b/modules/pam_permit/Makefile.am
index 363ca7cf2293..ab598543c0f3 100644
--- a/modules/pam_permit/Makefile.am
+++ b/modules/pam_permit/Makefile.am
@@ -7,4 +7,4 @@ pkglib_LTLIBRARIES = pam_permit.la
 
 pam_permit_la_SOURCES = pam_permit.c
 pam_permit_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_permit_la_LIBADD = $(top_builddir)/lib/libpam.la
+pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
diff --git a/modules/pam_unix/Makefile.am b/modules/pam_unix/Makefile.am
index ad1ec67958f6..e368d1189c5a 100644
--- a/modules/pam_unix/Makefile.am
+++ b/modules/pam_unix/Makefile.am
@@ -8,5 +8,5 @@ pkglib_LTLIBRARIES = pam_unix.la
 
 pam_unix_la_SOURCES = pam_unix.c
 pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@
-pam_unix_la_LIBADD = $(top_builddir)/lib/libpam.la @CRYPT_LIBS@
+pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPT_LIBS@
 endif