diff --git a/.gitignore b/.gitignore
index 558bad1..670d495 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /qpid-proton-0.14.0.tar.gz
 /qpid-proton-0.17.0.tar.gz
 /qpid-proton-0.18.1.tar.gz
+/qpid-proton-0.21.0.tar.gz
diff --git a/licenses.xml b/licenses.xml
index a164ec6..bd9caed 100644
--- a/licenses.xml
+++ b/licenses.xml
@@ -3,7 +3,7 @@
   <dependencies>
     <dependency>
       <packageName>qpid-proton</packageName>
-      <version>0.18.0</version>
+      <version>0.21.0</version>
       <licenses>
         <license>
           <name>ASL 2.0</name>
diff --git a/qpid-proton.spec b/qpid-proton.spec
index 13a5424..4b698ec 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -16,7 +16,7 @@
 }
 
 Name:           qpid-proton
-Version:        0.18.1
+Version:        0.21.0
 Release:        1%{?dist}
 Group:          System Environment/Libraries
 Summary:        A high performance, lightweight messaging library
@@ -53,10 +53,7 @@ BuildRequires:  python-devel
 %endif
 BuildRequires:  epydoc
 %if 0%{?fedora}
-%if 0%{?fedora} > 25
 BuildRequires:  perl-generators
-%endif
-%if 0%{?fedora} > 26
 BuildRequires:  glibc-headers
 %endif
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -305,21 +302,20 @@ Requires:  qpid-proton-c = %{version}-%{release}
 %build
 
 %if 0%{?fedora}
-CXX11FLAG=" -Wno-error=format-security"
 %cmake \
-    -DPROTON_DISABLE_RPATH=true \
-   "-DCMAKE_CXX_FLAGS=$CXXFLAGS $CXX11FLAG" \
     -DSYSINSTALL_PYTHON=1 \
     -DSYSINSTALL_PERL=1 \
+    -DCMAKE_SKIP_RPATH:BOOL=OFF \
     .
 %endif
 %if 0%{?rhel}
-%cmake -DPROTON_DISABLE_RPATH=true \
+%cmake \
        -DCMAKE_EXE_LINKER_FLAGS="-Wl,-z,relro,-z,now" \
        -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro" \
        -DCMAKE_MODULE_LINKER_FLAGS="-Wl,-z,relro" \
        -DSYSINSTALL_BINDINGS=ON \
        -DBUILD_PERL=OFF \
+       -DCMAKE_SKIP_RPATH:BOOL=OFF \
        .
 %endif
 
@@ -404,6 +400,7 @@ rm -f  %{buildroot}%{proton_datadir}/examples/cpp/message_properties
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/multithreaded_client
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/multithreaded_client_flow_control
 rm -f  %{buildroot}%{proton_datadir}/examples/cpp/reconnect_client
+rm -f  %{buildroot}%{proton_datadir}/examples/cpp/colour_send
 rm -fr %{buildroot}%{proton_datadir}/examples/engine/java
 rm -fr %{buildroot}%{proton_datadir}/examples/go
 rm -fr %{buildroot}%{proton_datadir}/examples/java
@@ -422,6 +419,9 @@ popd
 %endif
 
 %changelog
+* Thu Mar  8 2018 Irina Boverman <iboverma@redhat.com> - 0.21.0-1
+- Rebased to 0.21.0
+
 * Thu Nov 16 2017 Irina Boverman <iboverma@redhat.com> - 0.18.1-1
 - Rebased to 0.18.1
 
diff --git a/sources b/sources
index 44393d0..c782c69 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (qpid-proton-0.18.1.tar.gz) = f51f7c622351255758ca3727d758f0893088d9e2f13d350134b06784e85da476e01cd73f747d20543933fefe202f55d0f56c50015e9d2be6ba9ab819aa85f23c
+SHA512 (qpid-proton-0.21.0.tar.gz) = 81facd2d6dc690a5b5d8ed2278177396dba1f4d0868421b05870c4492953762f563a39a6160ab2aee378596e327f27864fc15bbfddfb1e5efdc4a4066610f84d