diff --git a/configure.in b/configure.in
index 4c41e22f5..eebd9e6b4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,14 +1,9 @@
-AC_INIT
+AC_INIT(cyassl,1.9.6)    # !!! also change in ssl.h !!!
 AC_CANONICAL_SYSTEM
-AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(cyassl,1.9.6) # !!! also change in ssl.h !!!
 AM_CONFIG_HEADER(ctaocrypt/include/config.h)
-
-
-#dnl Include m4
-#sinclude(lib_socket_nsl.m4)
-#sinclude(acx_pthread.m4)
 AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE(subdir-objects)
+
 
 
 # make sure configure doesn't add to CFLAGS
diff --git a/ctaocrypt/include/config.h b/ctaocrypt/include/config.h
index 1267a8baf..40770afdc 100644
--- a/ctaocrypt/include/config.h
+++ b/ctaocrypt/include/config.h
@@ -58,16 +58,16 @@
 #define PACKAGE_BUGREPORT ""
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "cyassl"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#define PACKAGE_STRING "cyassl 1.9.6"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#define PACKAGE_TARNAME "cyassl"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+#define PACKAGE_VERSION "1.9.6"
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
diff --git a/src/include.am b/src/include.am
index e3fb12555..a04b2d804 100644
--- a/src/include.am
+++ b/src/include.am
@@ -18,7 +18,7 @@ src_libcyassl_la_SOURCES = \
     ctaocrypt/src/cyassl_memory.c
 src_libcyassl_la_LDFLAGS = -no-undefined -version-info 1:0:0
 src_libcyassl_la_CFLAGS = -DBUILDING_CYASSL
-EXTRA_DIST += ../include/*.h ../include/openssl/*.h ../include/*.rc
+EXTRA_DIST += include/*.h include/openssl/*.h include/*.rc
 
 if BUILD_AESNI
 src_libcyassl_la_SOURCES += ctaocrypt/src/aes_asm.s