diff --git a/libwebsockets.spec b/libwebsockets.spec
index 32ccdf63..1bf82e22 100644
--- a/libwebsockets.spec
+++ b/libwebsockets.spec
@@ -1,17 +1,27 @@
+%global commit0 1587c5537d4c9a70b2d7f8238464037d2b5bfe22
+%global gitbranch0 v1.6-stable
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
 Name:		libwebsockets
 Version:	1.6.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A lightweight C library for Websockets
 
 Group:		System Environment/Libraries
-License:	LGPLv2 with exceptions and MIT
+# base64-decode.c and ssl-http2.c is under MIT license with FPC exception.
+# https://fedorahosted.org/fpc/ticket/546
+# sha-1.c is BSD 3 clause, but we link to openssl instead.
+# getifaddrs is BSD 3 clause, but we use system-provided instead.
+# source tarball contains BSD and zlib licensed code in win32port.
+License:	LGPLv2 with exceptions and MIT and BSD and zlib
 URL:		http://libwebsockets.org
-Source0:	https://github.com/warmcat/libwebsockets/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:	https://github.com/warmcat/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
 
 BuildRequires:	cmake
 BuildRequires:	openssl-devel
 Requires:	openssl
 Provides:	bundled(base64-decode)
+Provides:	bundled(ssl-http2)
 
 %description
 This is the libwebsockets C library for lightweight websocket clients and
@@ -28,7 +38,7 @@ This package contains the header files needed for developing
 %{name} applications.
 
 %prep
-%setup -q
+%setup -qn %{name}-%{commit0}
 
 %build
 mkdir -p build
@@ -54,13 +64,13 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
 %license LICENSE
-%doc README.md changelog
+%doc README.md
 %{_libdir}/%{name}.so.*
-%{_libdir}/cmake/%{name}/*
+%{_libdir}/cmake/%{name}*
 
 %files devel
 %license LICENSE
-%doc README.coding.md README.test-apps.md libwebsockets-api-doc.html
+%doc README.coding.md README.test-apps.md changelog libwebsockets-api-doc.html
 %{_bindir}/%{name}*
 %{_includedir}/%{name}.h
 %{_includedir}/lws_config.h
@@ -69,6 +79,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_datadir}/libwebsockets-test-server
 
 %changelog
+* Wed Jan 20 2016 Andrew Cooks <acooks@linux.com> 1.6.0-3
+- Get source from the 1.6-stable branch
+- Bump release to pick up bug fixes.
+
 * Tue Jan 19 2016 Andrew Cooks <acooks@linux.com> 1.6.0-2
 - Merge improvements from previously reviewed spec on RH bug #1198498
 - Fetch tagged release from GH