diff --git a/jbigkit-2.0-shlib.patch b/jbigkit-2.0-shlib.patch
deleted file mode 100644
index 8d1eaed..0000000
--- a/jbigkit-2.0-shlib.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- jbigkit/pbmtools/Makefile.shlib	2008-08-25 23:26:39.000000000 +0100
-+++ jbigkit/pbmtools/Makefile	2008-09-03 16:41:20.000000000 +0100
-@@ -5,23 +5,23 @@
- CC = gcc
- 
- # Options for the compiler
--CFLAGS = -g -Wall -ansi -pedantic -I../libjbig # --coverage
-+CFLAGS ?= -g -Wall -ansi -pedantic -I../libjbig # --coverage
- 
- .SUFFIXES: .1 .5 .txt $(SUFFIXES)
- 
- all: pbmtojbg jbgtopbm pbmtojbg85 jbgtopbm85 \
--	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
-+#	pbmtojbg.txt jbgtopbm.txt pbm.txt pgm.txt
- 
--pbmtojbg: pbmtojbg.o ../libjbig/libjbig.a
-+pbmtojbg: pbmtojbg.o ../libjbig/libjbig.so
- 	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
- 
--jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
-+jbgtopbm: jbgtopbm.o ../libjbig/libjbig.so
- 	$(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
- 
--pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
-+pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.so
- 	$(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
- 
--jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
-+jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.so
- 	$(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
- 
- jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
-@@ -29,13 +29,13 @@ pbmtojbg.o: pbmtojbg.c ../libjbig/jbig.h
- jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h
- pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h
- 
--../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \
-+../libjbig/libjbig.so: ../libjbig/jbig.c ../libjbig/jbig.h \
- 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
--	make -C ../libjbig libjbig.a
-+	make -C ../libjbig libjbig.so
- 
--../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \
-+../libjbig/libjbig85.so: ../libjbig/jbig85.c ../libjbig/jbig85.h \
- 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
--	make -C ../libjbig libjbig85.a
-+	make -C ../libjbig libjbig85.so
- 
- test: test82 test85
- 
---- jbigkit/libjbig/Makefile.shlib	2008-08-30 18:20:52.000000000 +0100
-+++ jbigkit/libjbig/Makefile	2008-09-03 16:40:43.000000000 +0100
-@@ -5,25 +5,27 @@
- 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
-+PICFLAGS := -fPIC -DPIC
- 
--all: libjbig.a tstcodec tstcodec85
-+all: libjbig.so.$(VERSION) tstcodec tstcodec85
- 
--tstcodec: tstcodec.o jbig.o jbig_ar.o
--	$(CC) $(CFLAGS) -o tstcodec $+
-+tstcodec: tstcodec.o libjbig.so
-+	$(CC) $(CFLAGS) -o tstcodec $< -L. -ljbig
- 
--tstcodec85: tstcodec85.o jbig85.o jbig_ar.o
--	$(CC) $(CFLAGS) -o tstcodec85 $+
-+tstcodec85: tstcodec85.o libjbig85.so
-+	$(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
- 
--libjbig.a: jbig.o jbig_ar.o
--	rm -f libjbig.a
--	ar rc libjbig.a jbig.o jbig_ar.o
--	-ranlib libjbig.a
-+%.so: %.so.$(VERSION)
-+	ln -sf $< $@
- 
--libjbig85.a: jbig85.o jbig_ar.o
--	rm -f libjbig85.a
--	ar rc libjbig85.a jbig85.o jbig_ar.o
--	-ranlib libjbig85.a
-+libjbig.so.$(VERSION): jbig.o jbig_ar.o
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ -o $@ $^
-+
-+libjbig85.so.$(VERSION): jbig85.o jbig_ar.o
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ -o $@ $^
-+
-+jbig.o jbig85.o jbig_ar.o: CFLAGS += $(PICFLAGS)
- 
- jbig.o: jbig.c jbig.h jbig_ar.h
- jbig85.o: jbig85.c jbig85.h jbig_ar.h
-@@ -37,12 +39,12 @@ jbig.pot: jbig.c
- 	  --msgid-bugs-address='http://www.cl.cam.ac.uk/~mgk25/jbigkit/' $+
- 
- test: tstcodec tstcodec85
--	./tstcodec
--	./tstcodec85
-+	LD_LIBRARY_PATH=`pwd` ./tstcodec
-+	LD_LIBRARY_PATH=`pwd` ./tstcodec85
- 
- t82test.pbm: tstcodec
--	./tstcodec $@
-+	LD_LIBRARY_PATH=`pwd` ./tstcodec $@
- 
- clean:
- 	rm -f *.{o,gcda,gcno,gcov} *~ core gmon.out dbg_d\=??.pbm t82test.pbm
--	rm -f tstcodec tstcodec85
-+	rm -f tstcodec tstcodec85 *.so *.so.$(VERSION)
---- jbigkit/Makefile.shlib	2008-08-30 21:40:22.000000000 +0100
-+++ jbigkit/Makefile	2008-09-03 16:40:43.000000000 +0100
-@@ -11,24 +11,25 @@ CCFLAGS = -O2 -W
- CFLAGS = $(CCFLAGS) -I../libjbig
- 
- VERSION=2.0
-+export VERSION CFLAGS CC
- 
- all: lib pbm
- 	@echo "Enter 'make test' in order to start some automatic tests."
- 
- lib:
--	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
-+	make -C libjbig
- 
- pbm: lib
--	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)")
-+	make -C pbmtools
- 
- test: lib pbm
--	(cd libjbig;  make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
--	(cd pbmtools; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" test)
-+	LD_LIBRARY_PATH=`pwd`/libjbig make -C libjbig test
-+	LD_LIBRARY_PATH=`pwd`/libjbig make -C pbmtools test
- 
- clean:
- 	rm -f *~ core
--	(cd libjbig; make clean)
--	(cd pbmtools; make clean)
-+	make -C libjbig clean
-+	make -C pbmtools clean
- 
- distribution: clean
- 	rm -f libjbig/libjbig*.a
diff --git a/jbigkit-2.0-warnings.patch b/jbigkit-2.0-warnings.patch
index 18c15d5..9d2008d 100644
--- a/jbigkit-2.0-warnings.patch
+++ b/jbigkit-2.0-warnings.patch
@@ -1,185 +1,6 @@
-diff -up jbigkit/libjbig/tstcodec85.c.warnings jbigkit/libjbig/tstcodec85.c
---- jbigkit/libjbig/tstcodec85.c.warnings	2008-08-23 22:06:31.000000000 +0200
-+++ jbigkit/libjbig/tstcodec85.c	2012-07-17 16:18:42.326419366 +0200
-@@ -334,7 +334,7 @@ int main(int argc, char **argv)
-   for (i = 0; i < 16 * 16 && !trouble; i++) {
-     pix = arith_decode(sd, (t82cx[i >> 4] >> ((15 - i) & 15)) & 1);
-     if (pix < 0) {
--      printf("Problem at pixel %ld, byte %d.\n\n",
-+      printf("Problem at pixel %ld, byte %td.\n\n",
- 	     i+1, sd->pscd_ptr - sd->pscd_end);
-       trouble++;
-       break;
-@@ -346,7 +346,7 @@ int main(int argc, char **argv)
-     }
-   }
-   if (!trouble && sd->pscd_ptr != sd->pscd_end - 2) {
--    printf("%d bytes left after decoder finished.\n\n",
-+    printf("%td bytes left after decoder finished.\n\n",
- 	   sd->pscd_end - sd->pscd_ptr - 2);
-     trouble++;
-   }
-@@ -374,7 +374,7 @@ int main(int argc, char **argv)
-       pix = arith_decode(sd, (t82cx[i >> 4] >> ((15 - i) & 15)) & 1);
-     }
-     if (pix < 0) {
--      printf("Problem at pixel %ld, byte %d.\n\n",
-+      printf("Problem at pixel %ld, byte %td.\n\n",
- 	     i+1, sd->pscd_ptr - sd->pscd_end);
-       trouble++;
-       break;
-@@ -386,7 +386,7 @@ int main(int argc, char **argv)
-     }
-   }
-   if (!trouble && sd->pscd_ptr != sd->pscd_end - 2) {
--    printf("%d bytes left after decoder finished.\n\n",
-+    printf("%td bytes left after decoder finished.\n\n",
- 	   sd->pscd_end - sd->pscd_ptr - 2);
-     trouble++;
-   }
-diff -up jbigkit/libjbig/tstcodec.c.warnings jbigkit/libjbig/tstcodec.c
---- jbigkit/libjbig/tstcodec.c.warnings	2008-08-30 19:20:58.000000000 +0200
-+++ jbigkit/libjbig/tstcodec.c	2012-07-17 16:17:28.649420322 +0200
-@@ -399,7 +399,7 @@ int main(int argc, char **argv)
-   for (i = 0; i < 16 * 16 && !trouble; i++) {
-     pix = arith_decode(sd, (t82cx[i >> 4] >> ((15 - i) & 15)) & 1);
-     if (pix < 0) {
--      printf("Problem at pixel %ld, byte %d.\n\n",
-+      printf("Problem at pixel %ld, byte %td.\n\n",
- 	     i+1, sd->pscd_ptr - sd->pscd_end);
-       trouble++;
-       break;
-@@ -411,7 +411,7 @@ int main(int argc, char **argv)
-     }
-   }
-   if (!trouble && sd->pscd_ptr != sd->pscd_end - 2) {
--    printf("%d bytes left after decoder finished.\n\n",
-+    printf("%td bytes left after decoder finished.\n\n",
- 	   sd->pscd_end - sd->pscd_ptr - 2);
-     trouble++;
-   }
-@@ -439,7 +439,7 @@ int main(int argc, char **argv)
-       pix = arith_decode(sd, (t82cx[i >> 4] >> ((15 - i) & 15)) & 1);
-     }
-     if (pix < 0) {
--      printf("Problem at pixel %ld, byte %d.\n\n",
-+      printf("Problem at pixel %ld, byte %td.\n\n",
- 	     i+1, sd->pscd_ptr - sd->pscd_end);
-       trouble++;
-       break;
-@@ -451,7 +451,7 @@ int main(int argc, char **argv)
-     }
-   }
-   if (!trouble && sd->pscd_ptr != sd->pscd_end - 2) {
--    printf("%d bytes left after decoder finished.\n\n",
-+    printf("%td bytes left after decoder finished.\n\n",
- 	   sd->pscd_end - sd->pscd_ptr - 2);
-     trouble++;
-   }
-diff -up jbigkit/pbmtools/jbgtopbm.c.warnings jbigkit/pbmtools/jbgtopbm.c
---- jbigkit/pbmtools/jbgtopbm.c.warnings	2008-08-27 23:37:45.000000000 +0200
-+++ jbigkit/pbmtools/jbgtopbm.c	2012-07-17 16:21:19.501283868 +0200
-@@ -110,7 +110,7 @@ void fprint_bytes(FILE *f, unsigned char
-   for (i = 0; i < len && i < max; i++)
-     fprintf(f, "%02x ", p[i]);
-   if (len > i)
--    fprintf(f, "... %d bytes total", len);
-+    fprintf(f, "... %zd bytes total", len);
-   fprintf(f, "\n");
- }
- 
-@@ -134,7 +134,7 @@ void diagnose_bie(FILE *fin)
-   /* read BIH */
-   read_file(&bie, &buflen, &len, fin);
-   if (len < 20) {
--    fprintf(f, "Error: Input file is %d < 20 bytes long and therefore "
-+    fprintf(f, "Error: Input file is %zd < 20 bytes long and therefore "
- 	    "does not contain an intact BIE header!\n", len);
-     return;
-   }
-@@ -188,18 +188,18 @@ void diagnose_bie(FILE *fin)
-       == (JBG_DPON | JBG_DPPRIV))
-     p += 1728;  /* skip DPTABLE */
-   if (p > bie + len) {
--    fprintf(f, "Error: Input file is %d < 20+1728 bytes long and therefore "
-+    fprintf(f, "Error: Input file is %zd < 20+1728 bytes long and therefore "
- 	    "does not contain an intact BIE header with DPTABLE!\n", len);
-     return;
-   }
-   while (p != bie + len) {
-     if (p > bie + len - 2) {
--      fprintf(f, "%06x: Error: single byte 0x%02x left\n", p - bie, *p);
-+      fprintf(f, "%06tx: Error: single byte 0x%02x left\n", p - bie, *p);
-       return;
-     }
-     pnext = jbg_next_pscdms(p, len - (p - bie));
-     if (p[0] != MARKER_ESC || p[1] == MARKER_STUFF) {
--      fprintf(f, "%06x: PSCD: ", p - bie);
-+      fprintf(f, "%06tx: PSCD: ", p - bie);
-       fprint_bytes(f, p, pnext ? (size_t) (pnext - p) : len - (p - bie), 60);
-       if (!pnext) {
- 	fprintf(f, "Error: PSCD not terminated by SDNORM or SDRST marker\n");
-@@ -209,7 +209,7 @@ void diagnose_bie(FILE *fin)
-       switch (p[1]) {
-       case MARKER_SDNORM:
-       case MARKER_SDRST:
--	fprintf(f, "%06x: ESC %s, ending SDE #%lu", p - bie,
-+	fprintf(f, "%06tx: ESC %s, ending SDE #%lu", p - bie,
- 		(p[1] == MARKER_SDNORM) ? "SDNORM" : "SDRST", ++sde);
- 	if (sde == sdes)
- 	  fprintf(f, " (final SDE)");
-@@ -219,10 +219,10 @@ void diagnose_bie(FILE *fin)
- 	fprintf(f, "\n");
- 	break;
-       case MARKER_ABORT:
--	fprintf(f, "%06x: ESC ABORT\n", p - bie);
-+	fprintf(f, "%06tx: ESC ABORT\n", p - bie);
- 	break;
-       case MARKER_NEWLEN:
--	fprintf(f, "%06x: ESC NEWLEN ", p - bie);
-+	fprintf(f, "%06tx: ESC NEWLEN ", p - bie);
- 	if (p + 5 < bie + len) {
- 	  fprintf(f, "YD = %lu\n",
- 		  yd = (((long) p[2] << 24) | ((long) p[3] << 16) |
-@@ -242,7 +242,7 @@ void diagnose_bie(FILE *fin)
- 	  fprintf(f, "unexpected EOF\n");
- 	break;
-       case MARKER_ATMOVE:
--	fprintf(f, "%06x: ESC ATMOVE ", p - bie);
-+	fprintf(f, "%06tx: ESC ATMOVE ", p - bie);
- 	if (p + 7 < bie + len)
- 	  fprintf(f, "YAT = %lu, tX = %d, tY = %d\n",
- 		  (((long) p[2] << 24) | ((long) p[3] << 16) |
-@@ -251,7 +251,7 @@ void diagnose_bie(FILE *fin)
- 	  fprintf(f, "unexpected EOF\n");
- 	break;
-       case MARKER_COMMENT:
--	fprintf(f, "%06x: ESC COMMENT ", p - bie);
-+	fprintf(f, "%06tx: ESC COMMENT ", p - bie);
- 	if (p + 5 < bie + len)
- 	  fprintf(f, "LC = %lu\n",
- 		  (((long) p[2] << 24) | ((long) p[3] << 16) |
-@@ -260,7 +260,7 @@ void diagnose_bie(FILE *fin)
- 	  fprintf(f, "unexpected EOF\n");
- 	break;
-       default:
--	fprintf(f, "%06x: ESC 0x%02x\n", p - bie, p[1]);
-+	fprintf(f, "%06tx: ESC 0x%02x\n", p - bie, p[1]);
-       }
-     if (!pnext) {
-       fprintf(f, "Error encountered!\n");
-@@ -372,7 +372,7 @@ int main (int argc, char **argv)
-   /* read BIH first to check VLENGTH */
-   len = fread(buffer, 1, 20, fin);
-   if (len < 20) {
--    fprintf(stderr, "Input file '%s' (%d bytes) must be at least "
-+    fprintf(stderr, "Input file '%s' (%zd bytes) must be at least "
- 	    "20 bytes long\n", fnin, len);
-     if (fout != stdout) {
-       fclose(fout);
-diff -up jbigkit/pbmtools/pbmtojbg85.c.warnings jbigkit/pbmtools/pbmtojbg85.c
---- jbigkit/pbmtools/pbmtojbg85.c.warnings	2008-08-26 00:26:39.000000000 +0200
-+++ jbigkit/pbmtools/pbmtojbg85.c	2012-07-17 16:24:56.741332942 +0200
+diff -up jbigkit-2.1/pbmtools/pbmtojbg85.c.warnings jbigkit-2.1/pbmtools/pbmtojbg85.c
+--- jbigkit-2.1/pbmtools/pbmtojbg85.c.warnings	2008-08-26 00:26:39.000000000 +0200
++++ jbigkit-2.1/pbmtools/pbmtojbg85.c	2012-07-17 16:24:56.741332942 +0200
 @@ -72,9 +72,12 @@ static unsigned long getint(FILE *f)
        while ((c = getc(f)) != EOF && !(c == 13 || c == 10)) ;
    if (c != EOF) {
@@ -206,9 +27,9 @@ diff -up jbigkit/pbmtools/pbmtojbg85.c.warnings jbigkit/pbmtools/pbmtojbg85.c
        break;
      default:
        fprintf(stderr, "Unsupported PBM type P%c!\n", type);
-diff -up jbigkit/pbmtools/pbmtojbg.c.warnings jbigkit/pbmtools/pbmtojbg.c
---- jbigkit/pbmtools/pbmtojbg.c.warnings	2008-07-16 22:59:41.000000000 +0200
-+++ jbigkit/pbmtools/pbmtojbg.c	2012-07-17 16:23:46.584285686 +0200
+diff -up jbigkit-2.1/pbmtools/pbmtojbg.c.warnings jbigkit-2.1/pbmtools/pbmtojbg.c
+--- jbigkit-2.1/pbmtools/pbmtojbg.c.warnings	2008-07-16 22:59:41.000000000 +0200
++++ jbigkit-2.1/pbmtools/pbmtojbg.c	2012-07-17 16:23:46.584285686 +0200
 @@ -88,7 +88,11 @@ static unsigned long getint(FILE *f)
        while ((c = getc(f)) != EOF && !(c == 13 || c == 10)) ;
    if (c != EOF) {
diff --git a/jbigkit-2.1-shlib.patch b/jbigkit-2.1-shlib.patch
new file mode 100644
index 0000000..febd7b0
--- /dev/null
+++ b/jbigkit-2.1-shlib.patch
@@ -0,0 +1,153 @@
+diff -Naur jbigkit-2.1.old/libjbig/Makefile jbigkit-2.1/libjbig/Makefile
+--- jbigkit-2.1.old/libjbig/Makefile	2014-03-27 19:47:15.000000000 +0100
++++ jbigkit-2.1/libjbig/Makefile	2014-08-04 10:45:31.865773710 +0200
+@@ -4,25 +4,27 @@
+ CC = gcc
+ 
+ # Options for the compiler: A high optimization level is suggested
+-CFLAGS = -g -O -W -Wall -ansi -pedantic # --coverage
++CFLAGS ?= -g -O -W -Wall -ansi -pedantic # --coverage
++PICFLAGS := -fPIC -DPIC
+ 
+-all: libjbig.a libjbig85.a tstcodec tstcodec85
++all: libjbig.so.$(VERSION) tstcodec tstcodec85
+ 
+-tstcodec: tstcodec.o jbig.o jbig_ar.o
+-	$(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 tstcodec85.o jbig85.o jbig_ar.o
++tstcodec85: tstcodec85.o libjbig85.so
++	$(CC) $(CFLAGS) -o tstcodec85 $^ -L. -ljbig
+ 
+-libjbig.a: jbig.o jbig_ar.o
+-	rm -f libjbig.a
+-	ar rc libjbig.a jbig.o jbig_ar.o
+-	-ranlib libjbig.a
++%.so: %.so.$(VERSION)
++	ln -sf $< $@
+ 
+-libjbig85.a: jbig85.o jbig_ar.o
+-	rm -f libjbig85.a
+-	ar rc libjbig85.a jbig85.o jbig_ar.o
+-	-ranlib libjbig85.a
++libjbig.so.$(VERSION): jbig.o jbig_ar.o
++	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ -o $@ $^
++
++libjbig85.so.$(VERSION): jbig85.o jbig_ar.o
++	$(CC) $(CFLAGS) -shared -Wl,-soname,$@ -o $@ $^
++
++jbig.o jbig85.o jbig_ar.o: CFLAGS += $(PICFLAGS)
+ 
+ jbig.o: jbig.c jbig.h jbig_ar.h
+ jbig85.o: jbig85.c jbig85.h jbig_ar.h
+@@ -43,11 +45,11 @@
+ 	clang --analyze *.c
+ 
+ test: tstcodec tstcodec85
+-	./tstcodec
+-	./tstcodec85
++	LD_LIBRARY_PATH=`pwd` ./tstcodec
++	LD_LIBRARY_PATH=`pwd` ./tstcodec85
+ 
+ t82test.pbm: tstcodec
+-	./tstcodec $@
++	LD_LIBRARY_PATH=`pwd` ./tstcodec $@
+ 
+ clean:
+ 	rm -f *.o *.gcda *.gcno *.gcov *.plist *~ core gmon.out dbg_d\=??.pbm
+diff -Naur jbigkit-2.1.old/Makefile jbigkit-2.1/Makefile
+--- jbigkit-2.1.old/Makefile	2014-03-27 19:47:15.000000000 +0100
++++ jbigkit-2.1/Makefile	2014-08-04 10:52:09.242027746 +0200
+@@ -10,19 +10,20 @@
+ export CC CFLAGS
+ 
+ VERSION=2.1
++export VERSION CFLAGS CC
+ 
+ all: lib pbm
+ 	@echo "Enter 'make test' in order to start some automatic tests."
+ 
+ lib:
+-	cd libjbig && $(MAKE) -e
++	make -C libjbig
+ 
+ pbm: lib
+-	cd pbmtools && $(MAKE) -e
++	make -C pbmtools
+ 
+ test: lib pbm
+-	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
+@@ -30,8 +31,8 @@
+ 
+ clean:
+ 	rm -f *~ core
+-	cd libjbig  && $(MAKE) clean
+-	cd pbmtools && $(MAKE) clean
++	make -C libjbig clean
++	make -C pbmtools clean
+ 
+ distribution:
+ 	rm -rf jbigkit-$(VERSION)
+diff -Naur jbigkit-2.1.old/pbmtools/Makefile jbigkit-2.1/pbmtools/Makefile
+--- jbigkit-2.1.old/pbmtools/Makefile	2014-03-27 19:47:15.000000000 +0100
++++ jbigkit-2.1/pbmtools/Makefile	2014-08-04 10:49:47.694581174 +0200
+@@ -4,26 +4,26 @@
+ CC = gcc
+ 
+ # Options for the compiler
+-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 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
+ 	$(CC) $(CFLAGS) -o pbmtojbg pbmtojbg.o -L../libjbig -ljbig
+ 
+-jbgtopbm: jbgtopbm.o ../libjbig/libjbig.a
++jbgtopbm: jbgtopbm.o ../libjbig/libjbig.so
+ 	$(CC) $(CFLAGS) -o jbgtopbm jbgtopbm.o -L../libjbig -ljbig
+ 
+-pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.a
++pbmtojbg85: pbmtojbg85.o ../libjbig/libjbig85.so
+ 	$(CC) $(CFLAGS) -o pbmtojbg85 pbmtojbg85.o -L../libjbig -ljbig85
+ 
+-jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.a
++jbgtopbm85: jbgtopbm85.o ../libjbig/libjbig85.so
+ 	$(CC) $(CFLAGS) -o jbgtopbm85 jbgtopbm85.o -L../libjbig -ljbig85
+ 
+ jbgtopbm.o: jbgtopbm.c ../libjbig/jbig.h
+@@ -31,13 +31,13 @@
+ jbgtopbm85.o: jbgtopbm85.c ../libjbig/jbig85.h
+ pbmtojbg85.o: pbmtojbg85.c ../libjbig/jbig85.h
+ 
+-../libjbig/libjbig.a: ../libjbig/jbig.c ../libjbig/jbig.h \
++../libjbig/libjbig.so: ../libjbig/jbig.c ../libjbig/jbig.h \
+ 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
+-	make -C ../libjbig libjbig.a
++	make -C ../libjbig libjbig.so
+ 
+-../libjbig/libjbig85.a: ../libjbig/jbig85.c ../libjbig/jbig85.h \
++../libjbig/libjbig85.so: ../libjbig/jbig85.c ../libjbig/jbig85.h \
+ 	../libjbig/jbig_ar.c ../libjbig/jbig_ar.h
+-	make -C ../libjbig libjbig85.a
++	make -C ../libjbig libjbig85.so
+ 
+ analyze:
+ 	clang $(CPPFLAGS) --analyze *.c
diff --git a/jbigkit.spec b/jbigkit.spec
index 587c819..076e251 100644
--- a/jbigkit.spec
+++ b/jbigkit.spec
@@ -1,15 +1,14 @@
 Name:           jbigkit
-Version:        2.0
-Release:        11%{?dist}
+Version:        2.1
+Release:        1%{?dist}
 Summary:        JBIG1 lossless image compression tools
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://www.cl.cam.ac.uk/~mgk25/jbigkit/
 Source0:        http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-%{version}.tar.gz
-Patch0:         jbigkit-2.0-shlib.patch
+Patch0:         jbigkit-2.1-shlib.patch
 Patch1:         jbigkit-2.0-warnings.patch
-Patch2:         jbigkit-CVE-2013-6369.patch
 
 Requires:       jbigkit-libs%{?_isa} = %{version}-%{release}
 
@@ -46,10 +45,9 @@ formats.
 
 
 %prep
-%setup -q -n jbigkit
+%setup -q -n jbigkit-2.1
 %patch0 -p1 -b .shlib
 %patch1 -p1 -b .warnings
-%patch2 -p1 -b .CVE-2013-6369
 
 %build
 make %{?_smp_mflags} CCFLAGS="$RPM_OPT_FLAGS"
@@ -94,6 +92,12 @@ make test
 %{_includedir}/jbig*.h
 
 %changelog
+* Mon Aug 04 2014 Fridolin Pokorny <fpokorny@redhat.com> - 2.1-1
+- Update to 2.1
+- Removed jbigkit-CVE-2013-6369.patch (accepted by upstream)
+- Updated jbigkit-2.0-warnings.patch to fix only fread() checks
+- Updated jbigkit-2.0-shlib.patch
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild