diff --git a/.gitignore b/.gitignore
index a750a96..163eb25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-mjpegtools-2.0.0.tar.gz
+mjpegtools-2.1.0.tar.gz
diff --git a/mjpegtools-2.0.0-no-config-in-public-header.h b/mjpegtools-2.0.0-no-config-in-public-header.h
deleted file mode 100644
index 2043f31..0000000
--- a/mjpegtools-2.0.0-no-config-in-public-header.h
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up mjpegtools-2.0.0/mplex/stream_params.hpp~ mjpegtools-2.0.0/mplex/stream_params.hpp
---- mjpegtools-2.0.0/mplex/stream_params.hpp~	2010-03-13 14:05:07.000000000 +0100
-+++ mjpegtools-2.0.0/mplex/stream_params.hpp	2011-08-02 23:34:12.126843444 +0200
-@@ -23,7 +23,6 @@
- #ifndef __STREAM_PARAMS_HH__
- #define __STREAM_PARAMS_HH__
- 
--#include <config.h>
- #include <mjpeg_types.h>
- class LpcmParams
- {
diff --git a/mjpegtools.spec b/mjpegtools.spec
index a976930..7e6c246 100644
--- a/mjpegtools.spec
+++ b/mjpegtools.spec
@@ -1,13 +1,11 @@
 Name:           mjpegtools
-Version:        2.0.0
-Release:        9%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Tools to manipulate MPEG data
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://mjpeg.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
-Patch0:         mjpegtools-2.0.0-no-config-in-public-header.h
-Patch1:         mjpegtools_gcc470.patch
 BuildRequires:  libjpeg-devel
 BuildRequires:  nasm
 BuildRequires:  libdv-devel
@@ -96,8 +94,6 @@ for building applications that use mjpegtools lavpipe libraries.
 
 %prep 
 %setup -q
-%patch0 -p1
-%patch1 -p1
 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
 sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
 for f in docs/yuvfps.1 ; do
@@ -183,6 +179,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode
 
 
 %changelog
+* Thu Nov 07 2013 Sérgio Basto <sergio@serjux.com> - 2.1.0-1
+- Update to 2.1.0
+- Drop upstreamed patches.
+
 * Wed Nov 06 2013 Sérgio Basto <sergio@serjux.com> - 2.0.0-9
 - Rebuilt for x264/FFmpeg
 
diff --git a/mjpegtools_gcc470.patch b/mjpegtools_gcc470.patch
deleted file mode 100644
index 050b33f..0000000
--- a/mjpegtools_gcc470.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/y4mdenoise/MotionSearcher.hh
-+++ b/y4mdenoise/MotionSearcher.hh
-@@ -2196,7 +2196,7 @@
- 	{
- 		// This region is too small to be bothered with.
- 		// Just get rid of it.
--		DeleteRegion (a_pRegion);
-+		this->DeleteRegion (a_pRegion);
- 	}
- 	else
- 	{
diff --git a/sources b/sources
index 80e9c7f..d7256b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-903e1e3b967eebcc5fe5626d7517dc46  mjpegtools-2.0.0.tar.gz
+57bf5dd78976ca9bac972a6511b236f3  mjpegtools-2.1.0.tar.gz