diff --git a/.cvsignore b/.cvsignore
index b8ff26d..deaf54f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 minicom-2.00.0.src.tar.bz2
+minicom-2.1.tar.gz
diff --git a/minicom.spec b/minicom.spec
index 1889b59..5772541 100644
--- a/minicom.spec
+++ b/minicom.spec
@@ -2,8 +2,8 @@
 
 Summary: A text-based modem control and terminal emulation program.
 Name: minicom
-Version: 2.00.0
-Release: 21
+Version: 2.1
+Release: 1
 License: GPL
 Group: Applications/Communications
 ExcludeArch: s390 s390x
@@ -13,19 +13,14 @@ PreReq: coreutils
 Requires: lockdev 
 URL:    http://alioth.debian.org/projects/minicom/
 
-Source: ftp://metalab.unc.edu/pub/Linux/apps/serialcomm/dialout/minicom-%{version}.src.tar.bz2
+Source: ftp://metalab.unc.edu/pub/Linux/apps/serialcomm/dialout/minicom-%{version}.tar.gz
 Source1: minicom.desktop
-Patch0: minicom-1.81-config.patch
-Patch1: minicom-1.83.1-make.patch
 Patch2: minicom-drop-privs.patch
-Patch3: minicom-1.83.1-time.patch
 Patch4: minicom-umask.patch
 
-Patch7: minicom-1.83.1-disable-message.patch
-Patch8: minicom-1.83.1-rh.patch
-Patch9: minicom-1.83-badlocales.patch
-Patch10: minicom-2.00.0-staticbuf.patch
-Patch11: minicom-2.00.0-esc.patch
+Patch8:  minicom-2.1-rh.patch
+Patch10: minicom-2.1-staticbuf.patch
+Patch11: minicom-2.1-esc.patch
 Patch12: minicom-2.00.0-inssp.patch
 Patch13: minicom-2.00.0-gotodir.patch
 Patch14: minicom-2.00.0-offby1.patch
@@ -39,14 +34,9 @@ language, and other features.
 
 %prep
 %setup -q
-###%patch0 -p1 -b .config               Appears unneeded in 2.00.0
-###%patch1 -p1 -b .make                 Appears unneeded in 2.00.0
 %patch2 -p1 -b .privs
-###%patch3 -p1 -b .time                 Appears unneeded in 2.00.0
 %patch4 -p1 -b .umask
-###%patch7 -p0 -b .disable-message      Stay or go?  We'll wait and see...
 %patch8 -p1 -b .rh
-###%patch9 -p1                          Needs removal, or repair
 %patch10 -p1 -b .staticbuf
 %patch11 -p1 -b .esc
 %patch12 -p1 -b .ins
@@ -91,6 +81,9 @@ install -m 644 doc/minicom.users $RPM_BUILD_ROOT/etc/minicom.users
 %endif
 
 %changelog
+* Thu Jul 14 2005 Martin Stransky <stransky@redhat.com> 2.1-1
+- New upstream version
+
 * Mon Mar  7 2005 Martin Stransky <stransky@redhat.com>
 - gcc4 patch
 
diff --git a/sources b/sources
index 40a876c..2427b48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-abc0bd2ec856cca633d764635f80ee41  minicom-2.00.0.src.tar.bz2
+1c8f3b247c38fb16c3c2170df9fc102a  minicom-2.1.tar.gz