diff --git a/autogen.sh b/autogen.sh
index ed42bc9..aaa670f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-rm -f config.cache ltconfig ltmain.sh
-rm -rf libtdl
+./autoclean.sh
 
 aclocal -I .
-libtoolize --copy --automake --ltdl
-autoheader
-touch ltconfig
-automake --copy --add-missing
 autoconf
+
+libtoolize --copy --automake --ltdl
+#autoheader
+#touch ltconfig
+automake --copy --add-missing
diff --git a/configure.in b/configure.in
index 5a6f8e8..89cf304 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,13 @@
-AC_INIT(configure.in)
+AC_INIT(scsh-yp,1.0)
+AC_CONFIG_SRCDIR(configure.in)
 AM_INIT_AUTOMAKE
-AM_CONFIG_HEADER(c/config.h)
 
-AC_LIBLTDL_CONVENIENCE
+dnl AM_MAINTAINER_MODE
+
 AC_LIBTOOL_DLOPEN
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
+AC_LIB_LTDL
+
 AC_PROG_CC
 
 AC_ARG_WITH(scsh-includes, 
@@ -21,8 +24,6 @@ AC_ARG_WITH(scsh-libraries,
                            scsh_libraries=/usr/local/lib/scsh)
 AC_SUBST(scsh_libraries)
 
-AC_CHECK_LIB(crypt, crypt)
-AC_CHECK_LIB(m, exp)
 AC_CHECK_FUNCS(yp_get_default_domain yp_bind yp_unbind)
 AC_CHECK_FUNCS(yperr_string ypprot_err)
 AC_CHECK_FUNCS(yp_match yp_order)