diff --git a/libauthclient/.gitignore b/pam/.gitignore
similarity index 60%
rename from libauthclient/.gitignore
rename to pam/.gitignore
index a2bd5d7d41768df8f3a490b1a98963026e565869..436752b4e09b7f4ec20c0b25f825d2de187bb6a0 100644
--- a/libauthclient/.gitignore
+++ b/pam/.gitignore
@@ -11,3 +11,14 @@ m4/lt*.m4
 m4/libtool.m4
 missing
 *~
+*.lo
+*.la
+*.o
+.deps
+.libs
+config.h
+config.log
+config.status
+libtool
+stamp-*
+Makefile
diff --git a/libauthclient/Makefile.am b/pam/Makefile.am
similarity index 100%
rename from libauthclient/Makefile.am
rename to pam/Makefile.am
diff --git a/libauthclient/auth_client.c b/pam/auth_client.c
similarity index 100%
rename from libauthclient/auth_client.c
rename to pam/auth_client.c
diff --git a/libauthclient/auth_client.h b/pam/auth_client.h
similarity index 100%
rename from libauthclient/auth_client.h
rename to pam/auth_client.h
diff --git a/libauthclient/configure.ac b/pam/configure.ac
similarity index 96%
rename from libauthclient/configure.ac
rename to pam/configure.ac
index 00d578b515ea50ccccbb1116c098c240bf71ac31..80fbc9956eca709387ff270a891e5f6d7f1bbd51 100644
--- a/libauthclient/configure.ac
+++ b/pam/configure.ac
@@ -5,6 +5,7 @@ AC_LANG(C)
 AM_INIT_AUTOMAKE([foreign])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR([m4])
+AC_DISABLE_STATIC
 
 AC_PROG_CC
 AC_PROG_INSTALL
diff --git a/libauthclient/m4/ax_compare_version.m4 b/pam/m4/ax_compare_version.m4
similarity index 100%
rename from libauthclient/m4/ax_compare_version.m4
rename to pam/m4/ax_compare_version.m4
diff --git a/libauthclient/m4/ax_lib_curl.m4 b/pam/m4/ax_lib_curl.m4
similarity index 100%
rename from libauthclient/m4/ax_lib_curl.m4
rename to pam/m4/ax_lib_curl.m4
diff --git a/libauthclient/m4/ax_lib_pam.m4 b/pam/m4/ax_lib_pam.m4
similarity index 100%
rename from libauthclient/m4/ax_lib_pam.m4
rename to pam/m4/ax_lib_pam.m4
diff --git a/libauthclient/m4/ax_path_generic.m4 b/pam/m4/ax_path_generic.m4
similarity index 100%
rename from libauthclient/m4/ax_path_generic.m4
rename to pam/m4/ax_path_generic.m4
diff --git a/libauthclient/m4/pam-const.m4 b/pam/m4/pam-const.m4
similarity index 100%
rename from libauthclient/m4/pam-const.m4
rename to pam/m4/pam-const.m4
diff --git a/libauthclient/pam_authclient.c b/pam/pam_authclient.c
similarity index 100%
rename from libauthclient/pam_authclient.c
rename to pam/pam_authclient.c