diff --git a/.gitignore b/.gitignore
index 670d495..d4c4102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /qpid-proton-0.17.0.tar.gz
 /qpid-proton-0.18.1.tar.gz
 /qpid-proton-0.21.0.tar.gz
+/qpid-proton-0.24.0.tar.gz
diff --git a/licenses.xml b/licenses.xml
index bd9caed..f922f65 100644
--- a/licenses.xml
+++ b/licenses.xml
@@ -3,7 +3,7 @@
   <dependencies>
     <dependency>
       <packageName>qpid-proton</packageName>
-      <version>0.21.0</version>
+      <version>0.24.0</version>
       <licenses>
         <license>
           <name>ASL 2.0</name>
diff --git a/qpid-proton.spec b/qpid-proton.spec
index e02979a..014160c 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -1,5 +1,4 @@
 %global proton_datadir %{_datadir}/proton-%{version}
-%global gem_name qpid_proton
 
 # per https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Preventing_files.2Fdirectories_from_being_scanned_for_deps_.28pre-scan_filtering.29
 %global __provides_exclude_from ^%{proton_datadir}/examples/.*$
@@ -20,8 +19,8 @@
 %{!?__python2:%global pythonx python}
 
 Name:           qpid-proton
-Version:        0.21.0
-Release:        2%{?dist}
+Version:        0.24.0
+Release:        1%{?dist}
 Group:          System Environment/Libraries
 Summary:        A high performance, lightweight messaging library
 License:        ASL 2.0
@@ -80,7 +79,7 @@ Obsoletes: qpid-proton
 %files c
 %defattr(-,root,root,-)
 %dir %{proton_datadir}
-%license %{proton_licensedir}/LICENSE
+%license %{proton_licensedir}/LICENSE.txt
 %license %{proton_licensedir}/licenses.xml
 %doc %{proton_datadir}/README*
 %{_libdir}/libqpid-proton.so.*
@@ -103,7 +102,7 @@ Requires:  qpid-proton-c%{?_isa} = %{version}-%{release}
 %files cpp
 %defattr(-,root,root,-)
 %dir %{proton_datadir}
-%license %{proton_licensedir}/LICENSE
+%license %{proton_licensedir}/LICENSE.txt
 %license %{proton_licensedir}/licenses.xml
 %doc %{proton_datadir}/README*
 %{_libdir}/libqpid-proton-cpp.so.*
@@ -165,10 +164,10 @@ Obsoletes: qpid-proton-c-devel-docs
 
 %files c-docs
 %defattr(-,root,root,-)
-%license %{proton_licensedir}/LICENSE
+%license %{proton_licensedir}/LICENSE.txt
 %license %{proton_licensedir}/licenses.xml
 %doc %{proton_datadir}/docs/api-c
-%doc %{proton_datadir}/examples/c/ssl_certs
+%doc %{proton_datadir}/examples/c/ssl-certs
 %doc %{proton_datadir}/examples/c/*.c
 %doc %{proton_datadir}/examples/c/*.h
 %doc %{proton_datadir}/examples/c/README.dox
@@ -187,7 +186,7 @@ Obsoletes: qpid-proton-cpp-devel-docs
 
 %files cpp-docs
 %defattr(-,root,root,-)
-%license %{proton_licensedir}/LICENSE
+%license %{proton_licensedir}/LICENSE.txt
 %license %{proton_licensedir}/licenses.xml
 %{proton_datadir}/docs/api-cpp
 %doc %{proton_datadir}/examples/cpp/*.cpp
@@ -195,7 +194,7 @@ Obsoletes: qpid-proton-cpp-devel-docs
 %doc %{proton_datadir}/examples/cpp/README.dox
 %doc %{proton_datadir}/examples/cpp/CMakeLists.txt
 %doc %{proton_datadir}/examples/cpp/example_test.py*
-%doc %{proton_datadir}/examples/cpp/ssl_certs
+%doc %{proton_datadir}/examples/cpp/ssl-certs
 %doc %{proton_datadir}/examples/cpp/tutorial.dox
 
 
@@ -214,7 +213,7 @@ Requires: %{pythonx}
 
 %files -n %{pythonx}-qpid-proton
 %defattr(-,root,root,-)
-%license %{proton_licensedir}/LICENSE
+%license %{proton_licensedir}/LICENSE.txt
 %license %{proton_licensedir}/licenses.xml
 %{python2_sitearch}/*
 
@@ -247,7 +246,7 @@ Obsoletes:  python-qpid-proton-doc
 
 %files -n python-qpid-proton-docs
 %defattr(-,root,root,-)
-%license %{proton_licensedir}/LICENSE
+%license %{proton_licensedir}/LICENSE.txt
 %license %{proton_licensedir}/licenses.xml
 %doc %{proton_datadir}/docs/api-py
 %doc %{proton_datadir}/examples/python
@@ -263,7 +262,7 @@ Requires:  qpid-proton-c = %{version}-%{release}
 %{summary}.
 
 %files -n perl-qpid-proton
-%doc LICENSE README*
+%doc LICENSE.txt README*
 %{perl_vendorarch}/*
 %endif
 
@@ -282,7 +281,7 @@ export ADDCXXFLAGS=" -Wno-error=format-security -Wno-error=catch-value="
     -DSYSINSTALL_PERL=1 \
     -DSYSINSTALL_BINDINGS=ON \
     -DCMAKE_SKIP_RPATH:BOOL=OFF \
-    "-DCMAKE_CXX_FLAGS=$CXXFLAGS $ADDCXXFLAGS" \
+    -DENABLE_FUZZ_TESTING=NO \
     .
 %endif
 %if 0%{?rhel} && 0%{?rhel} <= 7
@@ -293,6 +292,7 @@ export ADDCXXFLAGS=" -Wno-error=format-security -Wno-error=catch-value="
        -DSYSINSTALL_BINDINGS=ON \
        -DBUILD_PERL=OFF \
        -DCMAKE_SKIP_RPATH:BOOL=OFF \
+       -DENABLE_FUZZ_TESTING=NO \
        .
 %endif
 
@@ -319,8 +319,8 @@ install -pm 644 %{SOURCE1} %{buildroot}%{proton_datadir}/
 %else
 install -dm 755 %{buildroot}%{proton_licensedir}
 install -pm 644 %{SOURCE1} %{buildroot}%{proton_licensedir}
-install -pm 644 %{buildroot}%{proton_datadir}/LICENSE %{buildroot}%{proton_licensedir}
-rm -f %{buildroot}%{proton_datadir}/LICENSE
+install -pm 644 %{buildroot}%{proton_datadir}/LICENSE.txt %{buildroot}%{proton_licensedir}
+rm -f %{buildroot}%{proton_datadir}/LICENSE.txt
 %endif
 
 # clean up files that are not shipped
@@ -369,6 +369,7 @@ rm -f  %{buildroot}%{proton_datadir}/examples/cpp/selected_recv
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/server
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/server_direct
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/service_bus
+rm -f  %{buildroot}%{proton_datadir}/examples/cpp/simple_connect
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/simple_recv
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/simple_send
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/ssl
@@ -396,6 +397,9 @@ popd
 %endif
 
 %changelog
+* Tue Jul 10 2018 Irina Boverman <iboverma@redhat.com> - 0.24.0-1
+- Rebased to 0.24.0
+
 * Wed Mar 14 2018 Irina Boverman <iboverma@redhat.com> - 0.21.0-2
 - Updated per changes on master
 
diff --git a/sources b/sources
index 94cf577..98a0201 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qpid-proton-0.21.0.tar.gz) = 81facd2d6dc690a5b5d8ed2278177396dba1f4d0868421b05870c4492953762f563a39a6160ab2aee378596e327f27864fc15bbfddfb1e5efdc4a4066610f84d
+SHA512 (qpid-proton-0.24.0.tar.gz) = a93e7880b59df567c706ffda9420d752c58a91e244d52d50dd669eb30aca61f8a9a5efa4b9100d4d4499f701dc7d4b60f7ab575f6ee43f2c0611b58cbc66ceeb