diff --git a/.cvsignore b/.cvsignore
index 4afb880..4a8f71b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-optipng-0.6.2.tar.gz
+optipng-0.6.3.tar.gz
diff --git a/optipng-0.6.2.1.diff b/optipng-0.6.2.1.diff
deleted file mode 100644
index cba250e..0000000
--- a/optipng-0.6.2.1.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru optipng-0.6.2/lib/pngxtern/gif/gifread.c optipng-0.6.2.1/lib/pngxtern/gif/gifread.c
---- optipng-0.6.2/lib/pngxtern/gif/gifread.c	2006-08-10 20:17:00.000000000 -0400
-+++ optipng-0.6.2.1/lib/pngxtern/gif/gifread.c	2009-02-20 03:11:00.000000000 -0500
-@@ -219,8 +219,7 @@
-  **/
- static void GIFReadNextExtension(struct GIFExtension *ext, FILE *stream)
- {
--    unsigned char *ptr;
--    unsigned int len;
-+    unsigned int offset, len;
-     int count, label;
- 
-     GIF_FGETC(label, stream);
-@@ -233,7 +232,7 @@
-         return;
-     }
- 
--    ptr = ext->Buffer;
-+    offset = 0;
-     len = ext->BufferSize;
-     for ( ;; )
-     {
-@@ -243,10 +242,10 @@
-             ext->BufferSize += 1024;
-             ext->Buffer = realloc(ext->Buffer, ext->BufferSize);
-         }
--        count = ReadDataBlock(ptr, stream);
-+        count = ReadDataBlock(ext->Buffer + offset, stream);
-         if (count == 0)
-             break;
--        ptr += count;
-+        offset += count;
-         len -= count;
-     }
- }
-diff -ru optipng-0.6.2/src/optipng.c optipng-0.6.2.1/src/optipng.c
---- optipng-0.6.2/src/optipng.c	2008-11-09 23:56:00.000000000 -0500
-+++ optipng-0.6.2.1/src/optipng.c	2008-11-11 13:57:00.000000000 -0500
-@@ -542,6 +542,7 @@
- static void
- app_init(void)
- {
-+    setvbuf(stdout, NULL, _IONBF, 0);
-     if (options.log_name != NULL)
-     {
-         /* Open the log file, line-buffered. */
-diff -ru optipng-0.6.2/src/proginfo.h optipng-0.6.2.1/src/proginfo.h
---- optipng-0.6.2/src/proginfo.h	2008-11-09 23:56:00.000000000 -0500
-+++ optipng-0.6.2.1/src/proginfo.h	2009-02-22 23:38:00.000000000 -0500
-@@ -1,5 +1,5 @@
- #define PROGRAM_NAME        "OptiPNG"
- #define PROGRAM_DESCRIPTION "Advanced PNG optimizer"
--#define PROGRAM_VERSION     "0.6.2"
--#define PROGRAM_COPYRIGHT   "Copyright (C) 2001-2008 Cosmin Truta"
-+#define PROGRAM_VERSION     "0.6.2.1"
-+#define PROGRAM_COPYRIGHT   "Copyright (C) 2001-2009 Cosmin Truta"
- #define PROGRAM_URI         "http://optipng.sourceforge.net/"
diff --git a/optipng.spec b/optipng.spec
index 8f3bfc3..19e341f 100644
--- a/optipng.spec
+++ b/optipng.spec
@@ -1,14 +1,14 @@
+%global makefile gcc.mak
+
 Name:           optipng
-Version:        0.6.2.1
+Version:        0.6.3
 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
-Source0:        http://downloads.sourceforge.net/optipng/%{name}-0.6.2.tar.gz
-Patch0:         http://downloads.sourceforge.net/optipng/optipng-0.6.2.1.diff
+Source0:        http://downloads.sourceforge.net/optipng/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  zlib-devel libpng-devel
@@ -21,15 +21,12 @@ and corrections.
 
 
 %prep
-%setup -q -n %{name}-0.6.2
+%setup -q
 
-# Ensure system libs and headers are used; as of 0.6.1 pngxtern will use
+# Ensure system libs and headers are used; as of 0.6.3 pngxtern will use
 # the bundled headers if present even with -with-system-*, causing failures.
 rm -rf lib/libpng lib/zlib
 
-%define makefile gcc.mak
-
-%patch0 -p1
 
 %build
 ./configure -with-system-zlib -with-system-libpng
@@ -58,6 +55,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 19 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.6.3-1
+- Update to 0.6.3.
+- Use %%global instead of %%define.
+
 * Wed Feb 25 2009 Till Maas <opensource@till.name> - 0.6.2.1-1
 - Update to new release to fix array overflow
 - Red Hat Bugzilla #487364
diff --git a/sources b/sources
index e8d14dd..78f38b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08b6195bb5895a7fe167fab16dcdf6d5  optipng-0.6.2.tar.gz
+6cef405197a878acff4c6216cf38e871  optipng-0.6.3.tar.gz