diff --git a/afl-1.28b-override-cflags.patch b/afl-1.28b-override-cflags.patch
deleted file mode 100644
index e6d88d7..0000000
--- a/afl-1.28b-override-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur afl-1.71b.old/Makefile afl-1.71b/Makefile
---- afl-1.71b.old/Makefile	2015-04-20 02:17:54.000000000 +0100
-+++ afl-1.71b/Makefile	2015-04-23 21:34:41.888772510 +0100
-@@ -25,7 +25,7 @@
- PROGS       = afl-gcc afl-as afl-fuzz afl-showmap afl-tmin afl-gotcpu
- 
- CFLAGS     ?= -O3 -funroll-loops
--CFLAGS     += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \
-+override CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \
- 	      -DAFL_PATH=\"$(HELPER_PATH)\" -DDOC_PATH=\"$(DOC_PATH)\" \
- 	      -DBIN_PATH=\"$(BIN_PATH)\" -DVERSION=\"$(VERSION)\"
- 
-Only in afl-1.71b: Makefile.orig
diff --git a/afl-2.00b-override-cflags.patch b/afl-2.00b-override-cflags.patch
new file mode 100644
index 0000000..83be547
--- /dev/null
+++ b/afl-2.00b-override-cflags.patch
@@ -0,0 +1,13 @@
+diff -ur afl-2.00b/Makefile afl-2.00b-cflags/Makefile
+--- afl-2.00b/Makefile	2016-02-12 06:06:14.000000000 +0000
++++ afl-2.00b-cflags/Makefile	2016-02-15 12:04:56.690784941 +0000
+@@ -26,7 +26,7 @@
+ SH_PROGS    = afl-plot afl-cmin afl-whatsup
+ 
+ CFLAGS     ?= -O3 -funroll-loops
+-CFLAGS     += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \
++override CFLAGS += -Wall -D_FORTIFY_SOURCE=2 -g -Wno-pointer-sign \
+ 	      -DAFL_PATH=\"$(HELPER_PATH)\" -DDOC_PATH=\"$(DOC_PATH)\" \
+ 	      -DBIN_PATH=\"$(BIN_PATH)\" -DVERSION=\"$(VERSION)\"
+ 
+Only in afl-2.00b-cflags: Makefile.orig
diff --git a/american-fuzzy-lop.spec b/american-fuzzy-lop.spec
index af4fbdb..8ae2f03 100644
--- a/american-fuzzy-lop.spec
+++ b/american-fuzzy-lop.spec
@@ -1,6 +1,6 @@
 Name:          american-fuzzy-lop
-Version:       1.96b
-Release:       2%{?dist}
+Version:       2.00b
+Release:       1%{?dist}
 
 Summary:       Practical, instrumentation-driven fuzzer for binary formats
 
@@ -11,7 +11,7 @@ URL:           http://lcamtuf.coredump.cx/afl/
 Source0:       afl-%{version}.tgz
 
 # Allow CFLAGS to be appended.
-Patch1:        afl-1.28b-override-cflags.patch
+Patch1:        afl-2.00b-override-cflags.patch
 
 # Upstream includes armv7hl support as some non-integrated 'contrib'
 # files, so I have not enabled it here.  No other arch is supported
@@ -79,6 +79,8 @@ This subpackage contains clang and clang++ support for
 %doc docs/*
 %doc experimental/
 %doc testcases/
+%{_bindir}/afl-analyze
+%{_bindir}/afl-as
 %{_bindir}/afl-fuzz
 %{_bindir}/afl-gcc
 %{_bindir}/afl-g++
@@ -100,6 +102,11 @@ This subpackage contains clang and clang++ support for
 
 
 %changelog
+* Mon Feb 15 2016 Richard W.M. Jones <rjones@redhat.com> - 2.00b-1
+- New upstream version 2.00b (RHBZ#1306060).
+- Rebase CFLAGS override patch.
+- New programs afl-analyze, afl-as.
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.96b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 87eab06..f67d5ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a87164448a1e9a4007919a26c29e7c76  afl-1.96b.tgz
+7afc9d0a01f0c4c19cead91e6884027c  afl-2.00b.tgz