diff --git a/README.md b/README.md
index 9e64a27..7604eae 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,45 @@
 meta-wolfssl
 ==========
 
-This layer provides a bbappend file for configuring cURL with wolfSSL. 
+This layer provides a bbappend file for configuring cURL with wolfSSL.
 The wolfSSL recipe can be located [here.](
-https://github.com/openembedded/meta-oe/tree/master/meta-networking/recipes-connectivity/cyassl)
+https://github.com/openembedded/meta-oe/tree/master/meta-networking/recipes-connectivity/wolfssl)
 
-CyaSSL is a lightweight SSL library written in C and targeted at
-embedded and RTOS environments - primarily because of its small size,
-speed, and feature set. With common build sizes between 30-100kB,
+wolfSSL (formerly CyaSSL) is a lightweight SSL/TLS library written in C and
+targeted at embedded and RTOS environments - primarily because of its small
+size, speed, and feature set. With common build sizes between 20-100kB,
 it is typically up to 20 times smaller than OpenSSL. Other feature
-highlights include support for TLS 1.2 and DTLS, full client and
+highlights include support for TLS 1.2 and DTLS 1.2, full client and
 server support, abstraction layers for easy porting, CRL and OCSP
 support, key and cert generation, and much more. For a full feature
-list, please visit the CyaSSL webpage at:
+list, please visit the wolfSSL webpage at:
 
-http://www.wolfssl.com/yaSSL/Products-cyassl.html
+http://www.wolfssl.com/wolfSSL/Products-wolfssl.html
 
 Setup
 -----
 
-`For detailed image writing and installation instructions, see our 
+`For detailed image writing and installation instructions, see our
 Beginner's Guide.`
 
-Clone meta-wolfssl onto your machine. 
+Clone meta-wolfssl onto your machine.
 
-After installing YoctoProject/OpenEmbedded components and then running 
+After installing YoctoProject/OpenEmbedded components and then running
 their build command:
-    
+
 1. Insert the meta-wolfssl file location into the build's bblayers.conf
    file in BBLAYERS ?= "" section.
+
 2. Edit the build's local.conf file to include this line:
-       
-    IMAGE_INSTALL_append = " cyassl" (include benchmark and/or ctaocrypt
+
+    IMAGE_INSTALL_append = " wolfssl" (include benchmark and/or wolfcrypt
                                           test recipes if needed)
 3. Edit an image file to include this line:
 
-    IMAGE_INSTALL += "cyassl"
+    IMAGE_INSTALL += "wolfssl"
 
-Once you have built your image, the location on the new machine for cyassl 
-will be in /usr/libs, while benchmark and ctaocrypt will be located in 
+Once you have built your image, the location on the new machine for wolfssl
+will be in /usr/libs, while benchmark and wolfcrypt will be located in
 /usr/bin.
 
 
@@ -47,10 +48,12 @@ Maintenance
 
 Layer maintainer: Chris Conlon <chris@wolfssl.com>
 
+https://www.wolfssl.com
+
 License
 -------
 
-CyaSSL is open source and dual licensed under both the GPLv2
+wolfSSL is open source and dual licensed under both the GPLv2
 and a standard commercial license. For commercial license
-questions, please contact yaSSL at info@yassl.com.
+questions, please contact yaSSL at info@wolfssl.com.
 
diff --git a/recipes-support/curl/curl_7.37.1.bbappend b/recipes-support/curl/curl_7.37.1.bbappend
index f12bfb3..c0fa290 100644
--- a/recipes-support/curl/curl_7.37.1.bbappend
+++ b/recipes-support/curl/curl_7.37.1.bbappend
@@ -2,12 +2,12 @@ PACKAGECONFIG[gnutls] =  "--without-gnutls"
 
 EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
                 --without-libssh2 \
-                --with-random=/dev/urandom \ 
+                --with-random=/dev/urandom \
                 --without-libidn \
-                --enable-crypto-auth \    
-                --disable-ldap \    
-                --disable-ldaps \   
-                --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \  
+                --enable-crypto-auth \
+                --disable-ldap \
+                --disable-ldaps \
+                --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
                 --with-wolfssl \
                 --without-gnutls \
-                "      
+                "