diff --git a/jbigkit-2.0.tar.gz b/jbigkit-2.0.tar.gz
deleted file mode 100644
index d7a5a8b..0000000
--- a/jbigkit-2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee
-size 435027
diff --git a/jbigkit-2.0-shlib.patch b/jbigkit-2.1-shlib.patch
similarity index 61%
rename from jbigkit-2.0-shlib.patch
rename to jbigkit-2.1-shlib.patch
index 9307035..b2df935 100644
--- a/jbigkit-2.0-shlib.patch
+++ b/jbigkit-2.1-shlib.patch
@@ -1,28 +1,28 @@
-diff -aur jbigkit/libjbig/Makefile jbigkit+/libjbig/Makefile
---- jbigkit/libjbig/Makefile	2008-08-30 13:20:52.000000000 -0400
-+++ jbigkit+/libjbig/Makefile	2012-04-12 04:56:11.000000000 -0400
-@@ -2,28 +2,33 @@
- # $Id: Makefile 1285 2008-08-18 13:36:45Z mgk25 $
+diff -ruN jbigkit-2.1/libjbig/Makefile jbigkit-2.1-shlib/libjbig/Makefile
+--- jbigkit-2.1/libjbig/Makefile	2014-03-27 14:47:15.000000000 -0400
++++ jbigkit-2.1-shlib/libjbig/Makefile	2014-04-14 19:54:00.000000000 -0400
+@@ -1,28 +1,33 @@
+ # Unix makefile for the JBIG-KIT library
  
  # Select an ANSI/ISO C compiler here, GNU gcc is recommended
 -CC = gcc
 +CC ?= gcc
  
  # Options for the compiler: A high optimization level is suggested
--CFLAGS = -g -O -Wall -ansi -pedantic # --coverage
-+CFLAGS ?= -g -O -Wall -ansi -pedantic # --coverage
+-CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
++CFLAGS ?= -g -O -W -Wall -ansi -pedantic # --coverage
 +PICFLAGS := -fPIC -DPIC
  
--all: libjbig.a tstcodec tstcodec85
+-all: libjbig.a libjbig85.a tstcodec tstcodec85
 +all: libjbig.so.$(SOVERSION) libjbig85.so.$(SOVERSION) tstcodec tstcodec85
  
 -tstcodec: tstcodec.o jbig.o jbig_ar.o
--	$(CC) $(CFLAGS) -o tstcodec $+
+-	$(CC) $(CFLAGS) -o tstcodec tstcodec.o jbig.o jbig_ar.o
 +tstcodec: tstcodec.o libjbig.so
 +	$(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig
  
 -tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
--	$(CC) $(CFLAGS) -o tstcodec85 $+
+-	$(CC) $(CFLAGS) -o tstcodec85 tstcodec85.o jbig85.o jbig_ar.o
 +tstcodec85: tstcodec85.o libjbig85.so
 +	$(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
  
@@ -50,8 +50,8 @@ diff -aur jbigkit/libjbig/Makefile jbigkit+/libjbig/Makefile
  
  jbig.o: jbig.c jbig.h jbig_ar.h
  jbig85.o: jbig85.c jbig85.h jbig_ar.h
-@@ -37,12 +42,12 @@
- 	  --msgid-bugs-address='http://www.cl.cam.ac.uk/~mgk25/jbigkit/' $+
+@@ -43,13 +48,13 @@
+ 	clang --analyze *.c
  
  test: tstcodec tstcodec85
 -	./tstcodec
@@ -64,75 +64,85 @@ diff -aur jbigkit/libjbig/Makefile jbigkit+/libjbig/Makefile
 +	LD_LIBRARY_PATH=`pwd` ./tstcodec $@
  
  clean:
- 	rm -f *.{o,gcda,gcno,gcov} *~ core gmon.out dbg_d\=??.pbm t82test.pbm
+ 	rm -f *.o *.gcda *.gcno *.gcov *.plist *~ core gmon.out dbg_d\=??.pbm
+ 	rm -f t82test.pbm
 -	rm -f tstcodec tstcodec85
 +	rm -f tstcodec tstcodec85 libjbig*.so libjbig*.so.$(SOVERSION) libjbig*.so.$(VERSION)
-diff -aur jbigkit/Makefile jbigkit+/Makefile
---- jbigkit/Makefile	2008-08-30 16:40:22.000000000 -0400
-+++ jbigkit+/Makefile	2012-04-12 04:55:40.000000000 -0400
-@@ -2,33 +2,35 @@
- # $Id: Makefile 1303 2008-08-30 20:16:20Z mgk25 $
+diff -ruN jbigkit-2.1/Makefile jbigkit-2.1-shlib/Makefile
+--- jbigkit-2.1/Makefile	2014-03-27 14:47:15.000000000 -0400
++++ jbigkit-2.1-shlib/Makefile	2014-04-14 20:59:40.000000000 -0400
+@@ -1,37 +1,39 @@
+ # Unix makefile for JBIG-KIT
  
  # Select an ANSI/ISO C compiler here, GNU gcc is recommended
 -CC = gcc
 +CC ?= gcc
  
  # Options for the compiler: A high optimization level is suggested
- CCFLAGS = -O2 -W
- #CCFLAGS = -O -g -W -Wall -ansi -pedantic #-DDEBUG  # developer only
+-CFLAGS = -O2 -W -Wno-unused-result
++CFLAGS ?= -O2 -W -Wno-unused-result
+ # CFLAGS = -O -g -W -Wall -Wno-unused-result -ansi -pedantic # -DDEBUG
  
--CFLAGS = $(CCFLAGS) -I../libjbig
-+CFLAGS ?= $(CCFLAGS) -I../libjbig
+ export CC CFLAGS
  
- VERSION=2.0
+ VERSION=2.1
 +SOVERSION = $(basename $(VERSION))
-+export VERSION SOVERSION CFLAGS CC
++export VERSION SOVERSION
  
  all: lib pbm
  	@echo "Enter 'make test' in order to start some automatic tests."
  
  lib:
--	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
+-	cd libjbig && $(MAKE) -e
 +	make -C libjbig
  
  pbm: lib
--	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
+-	cd pbmtools && $(MAKE) -e
 +	make -C pbmtools
  
  test: lib pbm
--	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
--	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
+-	cd libjbig  && $(MAKE) test
+-	cd pbmtools && $(MAKE) test
 +	LD_LIBRARY_PATH=`pwd`/libjbig make -C libjbig test
 +	LD_LIBRARY_PATH=`pwd`/libjbig make -C pbmtools test
  
+ analyze:
+-	cd libjbig  && $(MAKE) analyze
+-	cd pbmtools && $(MAKE) analyze
++	make -C libjbig analyze
++	make -C pbmtools analyze
+ 
  clean:
  	rm -f *~ core
--	(cd libjbig; make clean)
--	(cd pbmtools; make clean)
+-	cd libjbig  && $(MAKE) clean
+-	cd pbmtools && $(MAKE) clean
 +	make -C libjbig clean
 +	make -C pbmtools clean
  
- distribution: clean
- 	rm -f libjbig/libjbig*.a
-diff -aur jbigkit/pbmtools/Makefile jbigkit+/pbmtools/Makefile
---- jbigkit/pbmtools/Makefile	2008-08-25 18:26:39.000000000 -0400
-+++ jbigkit+/pbmtools/Makefile	2012-04-12 04:55:18.000000000 -0400
-@@ -2,26 +2,26 @@
- # $Id: Makefile 1293 2008-08-25 22:26:39Z mgk25 $
+ distribution:
+ 	rm -rf jbigkit-$(VERSION)
+diff -ruN jbigkit-2.1/pbmtools/Makefile jbigkit-2.1-shlib/pbmtools/Makefile
+--- jbigkit-2.1/pbmtools/Makefile	2014-03-27 14:47:15.000000000 -0400
++++ jbigkit-2.1-shlib/pbmtools/Makefile	2014-04-14 21:04:14.000000000 -0400
+@@ -1,29 +1,29 @@
+ # Unix makefile for the JBIG-KIT PBM tools
  
  # Select an ANSI/ISO C compiler here, e.g. GNU gcc is recommended
 -CC = gcc
 +CC ?= gcc
  
  # Options for the compiler
--CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage
-+CFLAGS ?= -g -Wall -ansi -pedantic -I../libjbig # --coverage
+-CFLAGS = -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
++CFLAGS ?= -g -O -W -Wall -Wno-unused-result -ansi -pedantic # --coverage
+ CPPFLAGS = -I../libjbig 
  
  .SUFFIXES: .1 .5 .txt $(SUFFIXES)
+ .PHONY: txt test test82 test85 clean
  
- all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \
--	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
-+#	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
+-all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 txt
++all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 # txt
+ 
+ txt: pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
  
 -pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
 +pbmtojbg: pbmtojbg.o ../libjbig/libjbig.so
@@ -151,7 +161,7 @@ diff -aur jbigkit/pbmtools/Makefile jbigkit+/pbmtools/Makefile
  	$(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
  
  jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
-@@ -29,13 +29,13 @@
+@@ -31,13 +31,13 @@
  jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h
  pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h
  
@@ -167,5 +177,5 @@ diff -aur jbigkit/pbmtools/Makefile jbigkit+/pbmtools/Makefile
 -	make -C ../libjbig libjbig85.a
 +	make -C ../libjbig libjbig85.so
  
- test: test82 test85
- 
+ analyze:
+ 	clang $(CPPFLAGS) --analyze *.c
diff --git a/jbigkit-2.1.tar.gz b/jbigkit-2.1.tar.gz
new file mode 100644
index 0000000..7f36bb5
--- /dev/null
+++ b/jbigkit-2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de7106b6bfaf495d6865c7dd7ac6ca1381bd12e0d81405ea81e7f2167263d932
+size 438710
diff --git a/jbigkit.changes b/jbigkit.changes
index e2baf9e..95725e1 100644
--- a/jbigkit.changes
+++ b/jbigkit.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr 15 01:11:00 UTC 2014 - brian@aljex.com
+
+- v2.1
+-Fixes bnc#870855 
+-Fixes CVE-2013-6369
+
 -------------------------------------------------------------------
 Fri Jul 19 09:20:49 UTC 2013 - schwab@linux-m68k.org
 
diff --git a/jbigkit.spec b/jbigkit.spec
index 0830ebc..a41b397 100644
--- a/jbigkit.spec
+++ b/jbigkit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package jbigkit
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           jbigkit
 %define ver_maj 2
-%define ver_min 0
+%define ver_min 1
 Version:        %{ver_maj}.%{ver_min}
 Release:        0
 Summary:        JBIG1 lossless image compression tools
@@ -69,7 +69,7 @@ The jbigkit package contains tools for converting between PBM and JBIG1
 formats.
 
 %prep
-%setup -n %name
+%setup
 %patch0 -p1
 
 %build