diff --git a/.cvsignore b/.cvsignore
index 8108dbb..d60855c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-optipng-0.5.5.tar.gz
+optipng-0.6.1.tar.gz
diff --git a/optipng-0.5.4-makefile-externlibs.patch b/optipng-0.5.4-makefile-externlibs.patch
deleted file mode 100644
index cc2529c..0000000
--- a/optipng-0.5.4-makefile-externlibs.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ru optipng-0.5.4/lib/pngxtern/scripts/gcc.mak optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak
---- optipng-0.5.4/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:53.000000000 +0100
-+++ optipng-0.5.4.patched/lib/pngxtern/scripts/gcc.mak	2006-11-23 12:05:55.000000000 +0100
-@@ -39,7 +39,7 @@
- all: pngxtern$(A)
- 
- .c$(O):
--	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) $<
-+	$(CC) -c $(CFLAGS)  $<
- 
- pngxtern$(A): $(OBJS)
- 	$(AR_RC) $@ $(OBJS)
-diff -ru optipng-0.5.4/src/scripts/gcc.mak optipng-0.5.4.patched/src/scripts/gcc.mak
---- optipng-0.5.4/src/scripts/gcc.mak	2006-11-23 12:05:22.000000000 +0100
-+++ optipng-0.5.4.patched/src/scripts/gcc.mak	2006-11-23 12:05:21.000000000 +0100
-@@ -19,24 +19,20 @@
- ZLIB     = libz.a
- PNGLIB   = libpng.a
- PNGXLIB  = pngxtern.a
--ZMAK     = Makefile
--PNGMAK   = scripts/makefile.gcc
- PNGXMAK  = scripts/gcc.mak
--ZDIR     = ../lib/zlib
--PNGDIR   = ../lib/libpng
- PNGXDIR  = ../lib/pngxtern
- BACKHERE = ../../src
- 
- OBJS = optipng.o opngio.o opngreduc.o cbitset.o osys.o strutil.o
--LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
-+LIBS = $(PNGXDIR)/$(PNGXLIB)
- 
- 
- $(OPTIPNG): $(OBJS) $(LIBS)
--	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS)
-+	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
- 
- 
- .c.o:
--	$(CC) -c $(CFLAGS) -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) $*.c
-+	$(CC) -c $(CFLAGS) -I$(PNGXDIR) $*.c
- 
- optipng.o  : optipng.c proginfo.h opng.h cexcept.h cbitset.h osys.h strutil.h
- opngio.o   : opngio.c opng.h
-@@ -46,23 +42,11 @@
- strutil.o  : strutil.c strutil.h
- 
- 
--$(PNGXDIR)/$(PNGXLIB): $(ZDIR)/$(ZLIB) $(PNGDIR)/$(PNGLIB)
-+$(PNGXDIR)/$(PNGXLIB):
- 	cd $(PNGXDIR); \
- 	$(MAKE) -f $(PNGXMAK) $(PNGXLIB); \
- 	cd $(BACKHERE)
- 
--$(PNGDIR)/$(PNGLIB): $(ZDIR)/$(ZLIB)
--	cd $(PNGDIR); \
--	$(MAKE) -f $(PNGMAK) $(PNGLIB); \
--	cd $(BACKHERE)
--
--$(ZDIR)/$(ZLIB):
--	cd $(ZDIR); \
--	./configure; \
--	$(MAKE) -f $(ZMAK) $(ZLIB); \
--	cd $(BACKHERE)
--
--
- install: $(OPTIPNG)
- 	-@if [ ! -d ${bindir} ]; then mkdir -p ${bindir}; fi
- 	-@if [ ! -d ${man1dir} ]; then mkdir -p ${man1dir}; fi
-@@ -82,9 +66,3 @@
- 	cd $(PNGXDIR); \
- 	$(MAKE) -f $(PNGXMAK) clean; \
- 	cd $(BACKHERE)
--	cd $(PNGDIR); \
--	$(MAKE) -f $(PNGMAK) clean; \
--	cd $(BACKHERE)
--	cd $(ZDIR); \
--	$(MAKE) -f $(ZMAK) clean; \
--	cd $(BACKHERE)
diff --git a/optipng-0.5.5-log.patch b/optipng-0.5.5-log.patch
deleted file mode 100644
index 589afbf..0000000
--- a/optipng-0.5.5-log.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/optipng.c_orig	2007-09-09 10:02:38.000000000 +0200
-+++ src/optipng.c	2007-09-09 10:03:56.000000000 +0200
-@@ -298,6 +298,8 @@
-       vfprintf(confile, fmt, arg_ptr);
-    if (global.logfile != NULL)
-    {
-+      va_end(arg_ptr);
-+      va_start(arg_ptr, fmt);
-       vfprintf(global.logfile, fmt, arg_ptr);
-       fflush(global.logfile);
-    }
diff --git a/optipng.spec b/optipng.spec
index de3bdae..b40d850 100644
--- a/optipng.spec
+++ b/optipng.spec
@@ -1,15 +1,12 @@
 Name:           optipng
-Version:        0.5.5
-Release:        4%{?dist}
+Version:        0.6.1
+Release:        1%{?dist}
 Summary:        PNG optimizer and converter
 
 Group:          Applications/Multimedia
 License:        zlib
 URL:            http://optipng.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz
-# Patch0: http://sourceforge.net/tracker/index.php?func=detail&aid=1790969&group_id=151404&atid=780913
-Patch0:         optipng-0.5.5-log.patch
-Patch1:         optipng-0.5.4-makefile-externlibs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel libpng-devel
@@ -17,18 +14,21 @@ BuildRequires:  zlib-devel libpng-devel
 %description
 OptiPNG is a PNG optimizer that recompresses image files to a smaller size,
 without losing any information. This program also converts external formats
-(BMP, GIF, PNM; TIFF support is coming up) to optimized PNG, and performs PNG
-integrity checks and corrections. 
+(BMP, GIF, PNM and TIFF) to optimized PNG, and performs PNG integrity checks
+and corrections.
 
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+
+# Ensure system libs and headers are used; as of 0.6.1 pngxtern will use
+# the bundled headers if present even with -with-system-*, causing failures.
+rm -rf lib/libpng lib/zlib
 
 %define makefile gcc.mak
 
 %build
+./configure -with-system-zlib -with-system-libpng
 cd src/
 make -f scripts/%{makefile} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"\
                                             LDFLAGS="$RPM_OPT_FLAGS"
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 28 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.6.1-1
+- 0.6.1.
+
 * Thu Feb 14 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.5-4
 - Apply sf.net patch #1790969 to fix crash with -log.
 - Cosmetic specfile changes.
diff --git a/sources b/sources
index dc78fc1..138979b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9dbc2bb39e39b6ab4ed0c705d8035bdf  optipng-0.5.5.tar.gz
+39c7a7b2ae4dd5544e4dedb419a5e902  optipng-0.6.1.tar.gz