diff --git a/.gitignore b/.gitignore
index 29be92dd7..28c82e9da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ libtool
 tags
 .tags*
 cyassl-config
+wolfssl-config
 cyassl.sublime*
 fips.c
 fips_test.c
diff --git a/configure.ac b/configure.ac
index da5e433a0..3868ebbc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
 #
 #
 
-AC_INIT([cyassl],[3.3.0],[https://github.com/cyassl/cyassl/issues],[cyassl],[http://www.wolfssl.com])
+AC_INIT([wolfssl],[3.3.0],[https://github.com/wolfssl/wolfssl/issues],[wolfssl],[http://www.wolfssl.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 
@@ -1772,9 +1772,9 @@ AC_SUBST([AM_LDFLAGS])
 # FINAL
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([cyassl/version.h])
-AC_CONFIG_FILES([cyassl/options.h])
-AC_CONFIG_FILES([support/cyassl.pc])
+AC_CONFIG_FILES([wolfssl/version.h])
+AC_CONFIG_FILES([wolfssl/options.h])
+AC_CONFIG_FILES([support/wolfssl.pc])
 AC_CONFIG_FILES([rpm/spec])
 
 AX_CREATE_GENERIC_CONFIG
@@ -1796,10 +1796,11 @@ echo
 # generate user options header 
 echo "---"
 echo "Generating user options header..."
-OPTION_FILE="cyassl/options.h"
+
+OPTION_FILE="wolfssl/options.h"
 rm -f $OPTION_FILE
 
-echo "/* cyassl options.h" > $OPTION_FILE 
+echo "/* wolfssl options.h" > $OPTION_FILE 
 echo " * generated from configure options" >> $OPTION_FILE
 echo " *" >> $OPTION_FILE
 echo " * Copyright (C) 2006-2014 wolfSSL Inc." >> $OPTION_FILE
diff --git a/support/include.am b/support/include.am
index b0b4e494e..db3ed7387 100644
--- a/support/include.am
+++ b/support/include.am
@@ -2,9 +2,9 @@
 # All paths should be given relative to the root
 #
 
-EXTRA_DIST += support/cyassl.pc
+EXTRA_DIST += support/wolfssl.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = support/cyassl.pc
+pkgconfig_DATA = support/wolfssl.pc
 	     
 
diff --git a/support/wolfssl.pc b/support/wolfssl.pc
new file mode 100644
index 000000000..a5fb55761
--- /dev/null
+++ b/support/wolfssl.pc
@@ -0,0 +1,10 @@
+prefix=/usr/local
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: cyassl
+Description: cyassl C library.
+Version: 3.3.0
+Libs: -L${libdir} -lcyassl
+Cflags: -I${includedir}
diff --git a/support/cyassl.pc.in b/support/wolfssl.pc.in
similarity index 100%
rename from support/cyassl.pc.in
rename to support/wolfssl.pc.in
diff --git a/wolfssl/options.h b/wolfssl/options.h
index 6963bffad..1a696540d 100644
--- a/wolfssl/options.h
+++ b/wolfssl/options.h
@@ -22,6 +22,9 @@ extern "C" {
 #undef  NDEBUG
 #define NDEBUG
 
+#undef  _THREAD_SAFE
+#define _THREAD_SAFE
+
 #undef  NO_DSA
 #define NO_DSA
 
@@ -46,8 +49,8 @@ extern "C" {
 #undef  HAVE_HASHDRBG
 #define HAVE_HASHDRBG
 
-#undef  HAVE_PKCS7
-#define HAVE_PKCS7
+#undef  USE_FAST_MATH
+#define USE_FAST_MATH
 
 
 #ifdef __cplusplus
diff --git a/wolfssl/version.h b/wolfssl/version.h
index 86300d5bc..f3b85d1c4 100644
--- a/wolfssl/version.h
+++ b/wolfssl/version.h
@@ -1,4 +1,4 @@
-/* wolfssl_version.h.in
+/* cyassl_version.h.in
  *
  * Copyright (C) 2006-2014 wolfSSL Inc.
  *
diff --git a/wolfssl/version.h.in b/wolfssl/version.h.in
index ee1d639c2..1d2b538b6 100644
--- a/wolfssl/version.h.in
+++ b/wolfssl/version.h.in
@@ -2,14 +2,14 @@
  *
  * Copyright (C) 2006-2014 wolfSSL Inc.
  *
- * This file is part of CyaSSL.
+ * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
- * CyaSSL is free software; you can redistribute it and/or modify
+ * wolfSSL is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * CyaSSL is distributed in the hope that it will be useful,
+ * wolfSSL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -26,8 +26,8 @@
 extern "C" {
 #endif
 
-#define LIBCYASSL_VERSION_STRING "@VERSION@"
-#define LIBCYASSL_VERSION_HEX @HEX_VERSION@
+#define LIBWOLFSSL_VERSION_STRING "@VERSION@"
+#define LIBWOLFSSL_VERSION_HEX @HEX_VERSION@
 
 #ifdef __cplusplus
 }