diff --git a/contrib/packages/deb/ubuntu-precise/debian/patches/510_tigervnc11-ldnow.patch b/contrib/packages/deb/ubuntu-precise/debian/patches/510_tigervnc11-ldnow.patch
deleted file mode 100644
index e8e99b5..0000000
--- a/contrib/packages/deb/ubuntu-precise/debian/patches/510_tigervnc11-ldnow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/unix/xserver/hw/vnc/Makefile.am	2011-10-31 09:14:40.000000000 +0100
-+++ b/unix/xserver/hw/vnc/Makefile.am	2012-08-22 15:51:47.013241342 +0200
-@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
- 	-I$(top_srcdir)/include \
- 	${XSERVERLIBS_CFLAGS} -I$(includedir)
- 
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
- 
diff --git a/contrib/packages/deb/ubuntu-precise/debian/patches/series b/contrib/packages/deb/ubuntu-precise/debian/patches/series
index b9635cf..51c53e8 100644
--- a/contrib/packages/deb/ubuntu-precise/debian/patches/series
+++ b/contrib/packages/deb/ubuntu-precise/debian/patches/series
@@ -6,6 +6,5 @@
 
 # Upstream patches
 504_tigervnc-cookie.patch
-510_tigervnc11-ldnow.patch
 511_tigervnc11-gethomedir.patch
 516_tigervnc-xorg-manpages.patch
diff --git a/contrib/packages/deb/ubuntu-precise/debian/rules b/contrib/packages/deb/ubuntu-precise/debian/rules
index 29f5632..17686ce 100755
--- a/contrib/packages/deb/ubuntu-precise/debian/rules
+++ b/contrib/packages/deb/ubuntu-precise/debian/rules
@@ -53,8 +53,8 @@
 	cmake -G"Unix Makefiles" \
     -DBUILD_STATIC=off \
   	-DCMAKE_INSTALL_PREFIX=/usr \
-  	-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
-  	-DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2
+  	-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.3/lib/libfltk.a;$(CURDIR)/fltk-1.3.3/lib/libfltk_images.a;-lpng" \
+  	-DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.3
 	(cd unix/xserver; \
 	export PIXMANINCDIR=/usr/include/pixman-1; \
 	autoreconf -fiv; \
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch
deleted file mode 100644
index e8e99b5..0000000
--- a/contrib/packages/deb/ubuntu-trusty/debian/patches/510_tigervnc11-ldnow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/unix/xserver/hw/vnc/Makefile.am	2011-10-31 09:14:40.000000000 +0100
-+++ b/unix/xserver/hw/vnc/Makefile.am	2012-08-22 15:51:47.013241342 +0200
-@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
- 	-I$(top_srcdir)/include \
- 	${XSERVERLIBS_CFLAGS} -I$(includedir)
- 
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
- 
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch b/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch
deleted file mode 100644
index 36f3fc8..0000000
--- a/contrib/packages/deb/ubuntu-trusty/debian/patches/517_tigervnc-format-security.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tigervnc-1.3.0/vncviewer/vncviewer.cxx.format-security tigervnc-1.3.0/vncviewer/vncviewer.cxx
---- tigervnc-1.3.0/vncviewer/vncviewer.cxx.format-security	2013-12-03 16:47:04.802800182 +0000
-+++ tigervnc-1.3.0/vncviewer/vncviewer.cxx	2013-12-03 16:47:08.680820024 +0000
-@@ -309,7 +309,7 @@ interpretViaParam(char *remoteHost, int
- 
-   snprintf(vncServerName, VNCSERVERNAMELEN, "localhost::%d", localPort);
-   vncServerName[VNCSERVERNAMELEN - 1] = '\0';
--  vlog.error(vncServerName);
-+  vlog.error("%s", vncServerName);
- 
-   return 0;
- }
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/patches/series b/contrib/packages/deb/ubuntu-trusty/debian/patches/series
index ced87cc..51c53e8 100644
--- a/contrib/packages/deb/ubuntu-trusty/debian/patches/series
+++ b/contrib/packages/deb/ubuntu-trusty/debian/patches/series
@@ -6,7 +6,5 @@
 
 # Upstream patches
 504_tigervnc-cookie.patch
-510_tigervnc11-ldnow.patch
 511_tigervnc11-gethomedir.patch
 516_tigervnc-xorg-manpages.patch
-517_tigervnc-format-security.patch
diff --git a/contrib/packages/deb/ubuntu-trusty/debian/rules b/contrib/packages/deb/ubuntu-trusty/debian/rules
index 515cf2f..4ad2c13 100755
--- a/contrib/packages/deb/ubuntu-trusty/debian/rules
+++ b/contrib/packages/deb/ubuntu-trusty/debian/rules
@@ -60,8 +60,8 @@
 	cmake -G"Unix Makefiles" \
     -DBUILD_STATIC=off \
   	-DCMAKE_INSTALL_PREFIX=/usr \
-  	-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
-  	-DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2
+  	-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.3/lib/libfltk.a;$(CURDIR)/fltk-1.3.3/lib/libfltk_images.a;-lpng" \
+  	-DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.3
 	(cd unix/xserver; \
 	export PIXMANINCDIR=/usr/include/pixman-1; \
 	autoreconf -fiv; \
diff --git a/contrib/packages/rpm/el5/SOURCES/fltk-1.3.2-libdl.patch b/contrib/packages/rpm/el5/SOURCES/fltk-1.3.2-libdl.patch
deleted file mode 100644
index 78c8fd4..0000000
--- a/contrib/packages/rpm/el5/SOURCES/fltk-1.3.2-libdl.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
-diff --git a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	(revision 9965)
-+++ b/CMakeLists.txt	(working copy)
-@@ -138,6 +139,7 @@
- #######################################################################
- # libraries
- find_library(LIB_CAIRO cairo)
-+find_library(LIB_dl dl)
- find_library(LIB_fontconfig fontconfig)
- find_library(LIB_freetype freetype)
- find_library(LIB_GL GL)
-@@ -146,7 +148,7 @@
- find_library(LIB_png png)
- find_library(LIB_zlib z)
- 
--mark_as_advanced(LIB_CAIRO LIB_fontconfig LIB_freetype)
-+mark_as_advanced(LIB_CAIRO LIB_dl LIB_fontconfig LIB_freetype)
- mark_as_advanced(LIB_GL LIB_MesaGL)
- mark_as_advanced(LIB_jpeg LIB_png LIB_zlib)
- 
-Index: src/CMakeLists.txt
-===================================================================
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt	(revision 9965)
-+++ b/src/CMakeLists.txt	(working copy)
-@@ -220,7 +220,7 @@
- endif(MSVC)
- 
- if(USE_THREADS)
--   target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT})
-+   target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl})
- endif(USE_THREADS)
- 
- if(USE_X11)
-@@ -334,7 +334,7 @@
- endif(MSVC)
- 
- if(USE_THREADS)
--   target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
-+   target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl})
- endif(USE_THREADS)
- 
- if(USE_X11)
-@@ -384,11 +384,11 @@
- endif(MSVC)
- 
- if(USE_THREADS)
--   target_link_libraries(fltk_SHARED ${CMAKE_THREAD_LIBS_INIT})
-+   target_link_libraries(fltk_forms_SHARED ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl})
- endif(USE_THREADS)
- 
- if(USE_X11)
--   target_link_libraries(fltk_SHARED ${X11_LIBRARIES})
-+   target_link_libraries(fltk_forms_SHARED ${X11_LIBRARIES})
- endif(USE_X11)
- 
- #######################################################################
-diff -Naur a/CMake/FindDL.cmake b/CMake/FindDL.cmake
---- a/CMake/FindDL.cmake	1969-12-31 19:00:00.000000000 -0500
-+++ b/CMake/FindDL.cmake	2014-10-29 23:00:18.000000000 -0400
-@@ -0,0 +1,37 @@
-+# - Find dl functions
-+# This module finds dl libraries.
-+#
-+# It sets the following variables:
-+#  DL_FOUND       - Set to false, or undefined, if dl libraries aren't found.
-+#  DL_INCLUDE_DIR - The dl include directory.
-+#  DL_LIBRARY     - The dl library to link against.
-+
-+INCLUDE(CheckFunctionExists)
-+
-+FIND_PATH(DL_INCLUDE_DIR NAMES dlfcn.h)
-+FIND_LIBRARY(DL_LIBRARY NAMES dl)
-+
-+IF (DL_LIBRARY)
-+   SET(DL_FOUND TRUE)
-+ELSE (DL_LIBRARY)
-+   # if dlopen can be found without linking in dl then,
-+   # dlopen is part of libc, so don't need to link extra libs.
-+   CHECK_FUNCTION_EXISTS(dlopen DL_FOUND)
-+   SET(DL_LIBRARY "")
-+ENDIF (DL_LIBRARY)
-+
-+IF (DL_FOUND)
-+
-+   # show which dl was found only if not quiet
-+   IF (NOT DL_FIND_QUIETLY)
-+      MESSAGE(STATUS "Found dl: ${DL_LIBRARY}")
-+   ENDIF (NOT DL_FIND_QUIETLY)
-+
-+ELSE (DL_FOUND)
-+
-+   # fatal error if dl is required but not found
-+   IF (DL_FIND_REQUIRED)
-+      MESSAGE(FATAL_ERROR "Could not find dl")
-+   ENDIF (DL_FIND_REQUIRED)
-+
-+ENDIF (DL_FOUND)
diff --git a/contrib/packages/rpm/el5/SOURCES/fltk-1.3.2-static-libs.patch b/contrib/packages/rpm/el5/SOURCES/fltk-1.3.2-static-libs.patch
deleted file mode 100644
index 31154f6..0000000
--- a/contrib/packages/rpm/el5/SOURCES/fltk-1.3.2-static-libs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- fltk-1.3.2/src/CMakeLists.txt	2014-09-02 22:05:40.000000000 -0400
-+++ fltk-1.3.2/src/CMakeLists.txt	2014-09-02 22:12:35.000000000 -0400
-@@ -223,10 +223,6 @@
-    target_link_libraries(fltk ${CMAKE_THREAD_LIBS_INIT} ${LIB_dl})
- endif(USE_THREADS)
- 
--if(USE_X11)
--   target_link_libraries(fltk ${X11_LIBRARIES})
--endif(USE_X11)
--
- if(WIN32)
-    target_link_libraries(fltk comctl32)
- endif(WIN32)
-@@ -239,10 +235,6 @@
-    target_link_libraries(fltk ${X11_Xinerama_LIB})
- endif(HAVE_XINERAMA)
- 
--if(HAVE_XFIXES)
--   target_link_libraries(fltk ${X11_Xfixes_LIB})
--endif(HAVE_XFIXES)
--
- if(HAVE_XCURSOR)
-    target_link_libraries(fltk ${X11_Xcursor_LIB})
- endif(HAVE_XCURSOR)
-@@ -251,10 +243,30 @@
-    target_link_libraries(fltk ${X11_Xft_LIB})
- endif(USE_XFT)
- 
-+if(HAVE_XFIXES)
-+   target_link_libraries(fltk ${X11_Xfixes_LIB})
-+endif(HAVE_XFIXES)
-+
-+if(X11_Xrender_FOUND)
-+   target_link_libraries(fltk ${X11_Xrender_LIB})
-+endif(X11_Xrender_FOUND)
-+
-+if(USE_X11)
-+   target_link_libraries(fltk ${X11_LIBRARIES} -lxcb -lXdmcp -lXau)
-+endif(USE_X11)
-+
- if(LIB_fontconfig)
-    target_link_libraries(fltk ${LIB_fontconfig})
- endif(LIB_fontconfig)
- 
-+if(LIB_EXPAT)
-+   target_link_libraries(fltk ${LIB_EXPAT})
-+endif(LIB_EXPAT)
-+
-+if(LIB_freetype)
-+   target_link_libraries(fltk ${LIB_freetype} ${LIB_dl})
-+endif(LIB_freetype)
-+
- #######################################################################
- add_library(fltk_forms STATIC ${FLCPPFILES})
- target_link_libraries(fltk_forms fltk)
---- fltk-1.3.2/CMakeLists.txt	2014-09-02 22:56:47.000000000 -0400
-+++ fltk-1.3.2/CMakeLists.txt	2014-09-02 22:57:19.000000000 -0400
-@@ -147,6 +147,7 @@
- find_library(LIB_jpeg jpeg)
- find_library(LIB_png png)
- find_library(LIB_zlib z)
-+find_library(LIB_EXPAT expat)
- 
- mark_as_advanced(LIB_CAIRO LIB_dl LIB_fontconfig LIB_freetype)
- mark_as_advanced(LIB_GL LIB_MesaGL)
-@@ -383,7 +383,7 @@
- 
- if(OPENGL_FOUND)
-    set(CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR}/GL)
--   set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL)
-+   set(CMAKE_REQUIRED_LIBRARIES -lGLU -lGL -lXdmcp -lXau)
-    CHECK_FUNCTION_EXISTS(glXGetProcAddressARB HAVE_GLXGETPROCADDRESSARB)
-    set(FLTK_GL_FOUND TRUE)
- else()
diff --git a/contrib/packages/rpm/el5/SOURCES/fltk-1.3.3-static-libs.patch b/contrib/packages/rpm/el5/SOURCES/fltk-1.3.3-static-libs.patch
new file mode 100644
index 0000000..4e717e4
--- /dev/null
+++ b/contrib/packages/rpm/el5/SOURCES/fltk-1.3.3-static-libs.patch
@@ -0,0 +1,29 @@
+--- a/configure	2015-02-22 16:20:48.000000000 -0500
++++ b/configure	2015-02-22 16:21:52.000000000 -0500
+@@ -6793,7 +6793,7 @@
+   # See if we find them without any special options.
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS=$LIBS
+-  LIBS="-lX11 $LIBS"
++  LIBS="-lX11 -lXrender -lxcb -lXdmcp -lXau $LIBS"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <X11/Xlib.h>
+@@ -6935,7 +6935,7 @@
+     # Martyn Johnson says this is needed for Ultrix, if the X
+     # libraries were built with DECnet support.  And Karl Berry says
+     # the Alpha needs dnet_stub (dnet does not exist).
+-    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
++    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11 -lXrender -lxcb -lXdmcp -lXau"
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -7359,7 +7359,7 @@
+ $as_echo "$as_me: WARNING: Ignoring libraries \"$X_PRE_LIBS\" requested by configure." >&2;}
+ 	fi
+ 
+-	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
++	LIBS="$LIBS -lX11 -lXrender -lxcb -lXdmcp -lXau $X_EXTRA_LIBS"
+ 	CFLAGS="$CFLAGS $X_CFLAGS"
+ 	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+ 	LDFLAGS="$X_LIBS $LDFLAGS"
diff --git a/contrib/packages/rpm/el5/SOURCES/tigervnc11-ldnow.patch b/contrib/packages/rpm/el5/SOURCES/tigervnc11-ldnow.patch
deleted file mode 100644
index 0db5d88..0000000
--- a/contrib/packages/rpm/el5/SOURCES/tigervnc11-ldnow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am.ldnow	2010-05-18 15:48:02.000000000 +0200
-+++ tigervnc-1.0.90-20100721svn4113/unix/xserver/hw/vnc/Makefile.am	2010-07-21 17:05:45.242942531 +0200
-@@ -50,7 +50,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
- 	-I$(top_srcdir)/hw/xfree86/os-support/bus \
- 	-I$(includedir)/pixman-1 -I$(includedir)
- 
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
- 
diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index d1b2065..6ab92c3 100644
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -5,7 +5,7 @@
 
 Name: tigervnc
 Version: @VERSION@
-Release: 3%{?snap:.%{snap}}%{?dist}
+Release: 4%{?snap:.%{snap}}%{?dist}
 Summary: A TigerVNC remote display system
 
 Group: User Interface/Desktops
@@ -18,8 +18,9 @@
 Source2: vncserver.sysconfig
 Source6: vncviewer.desktop
 Source9: FindX11.cmake
-Source11: http://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz
+Source11: http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz
 Source12: http://downloads.sourceforge.net/project/libjpeg-turbo/1.3.0/libjpeg-turbo-1.3.0.tar.gz
+Source13: http://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.10/libpng-1.5.10.tar.bz2
 
 Source100: http://www.x.org/releases/X11R7.7/src/everything/bigreqsproto-1.1.2.tar.bz2
 Source101: http://www.x.org/releases/X11R7.7/src/everything/compositeproto-0.4.2.tar.bz2
@@ -128,13 +129,11 @@
 
 # tigervnc patches
 Patch4: tigervnc-cookie.patch
-Patch10: tigervnc11-ldnow.patch
 Patch11: tigervnc11-gethomedir.patch
 Patch12: tigervnc14-static-build-fixes.patch
 
 # fltk patches
-Patch124: fltk-1.3.2-libdl.patch
-Patch125: fltk-1.3.2-static-libs.patch
+Patch15: fltk-1.3.3-static-libs.patch
 
 # freetype patches
 Patch20:  freetype-2.1.10-enable-ft2-bci.patch
@@ -268,25 +267,16 @@
 sed -i -e "s#@_includedir@#%{xorg_buildroot}%{_includedir}#" cmake/Modules/FindX11.cmake
 sed -i -e "s#@_libdir@#%{xorg_buildroot}%{_libdir}#" cmake/Modules/FindX11.cmake
 %patch4 -p1 -b .cookie
-%patch10 -p1 -b .ldnow
 %patch11 -p1 -b .gethomedir
 %patch12 -p1 -b .static-build-fixes
 
 tar xzf %SOURCE11
 pushd fltk-*
-for p in `find ../contrib/fltk -maxdepth 1 -type f -name "*.patch"|sort` ;
-do
-  patch -p1 -i $p
-done
-# Search paths for X11 are hard coded into FindX11.cmake
-cp %SOURCE9 CMake/
-sed -i -e "s#@_includedir@#%{xorg_buildroot}%{_includedir}#" CMake/FindX11.cmake
-sed -i -e "s#@_libdir@#%{xorg_buildroot}%{_libdir}#" CMake/FindX11.cmake
-%patch124 -p1 -b .libdl
-%patch125 -p1 -b .static-libs
+%patch15 -p1 -b .static-libs
 popd
 
 tar xzf %SOURCE12
+tar xjf %SOURCE13
 
 mkdir xorg
 pushd xorg
@@ -707,21 +697,37 @@
 
 popd
 
+echo "*** Building libpng ***"
+pushd libpng-*
+CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" ./configure \
+  --prefix=%{_prefix} \
+  --libdir=%{_libdir} \
+  --disable-shared \
+  --enable-static
+make %{?_smp_mflags}
+make DESTDIR=%{xorg_buildroot} install
+popd
+
 echo "*** Building fltk ***"
 pushd fltk-*
 export CMAKE_PREFIX_PATH="%{xorg_buildroot}%{_prefix}:%{_prefix}"
 export CMAKE_EXE_LINKER_FLAGS=$LDFLAGS
 export PKG_CONFIG="pkg-config --static" 
-%{cmake28} -G"Unix Makefiles" \
-  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DOPTION_PREFIX_LIB=%{_libdir} \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DOPTION_USE_THREADS=off \
-  -DOPTION_BUILD_EXAMPLES=off \
-  -DOPTION_USE_SYSTEM_LIBPNG=on \
-  -DPNG_LIBRARY=%{_libdir}/libpng.a \
-  -DPNG_INCLUDE_DIR=%{_includedir} \
-  -DOPTION_USE_GL=off
+CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" ./configure \
+  --prefix=%{_prefix} \
+  --libdir=%{_libdir} \
+  --enable-x11 \
+  --enable-gl \
+  --disable-shared \
+  --enable-localjpeg \
+  --enable-localzlib \
+  --disable-localpng \
+  --enable-xinerama \
+  --enable-xft \
+  --enable-xdbe \
+  --enable-xfixes \
+  --enable-xcursor \
+  --with-x 
 make %{?_smp_mflags}
 make DESTDIR=%{xorg_buildroot} install
 popd
@@ -914,6 +920,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Feb 19 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.80-4
+- Bumped fltk to 1.3.3, no longer requires patching
+
 * Mon Jan 19 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.0-3
 - Added default font paths to Xvnc and fontconfig
 - Added vendor strings to Xvnc
diff --git a/contrib/packages/rpm/el6/SOURCES/tigervnc11-ldnow.patch b/contrib/packages/rpm/el6/SOURCES/tigervnc11-ldnow.patch
deleted file mode 100644
index f6edd09..0000000
--- a/contrib/packages/rpm/el6/SOURCES/tigervnc11-ldnow.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.ldnow tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am
---- tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am.ldnow	2011-10-31 09:14:40.000000000 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am	2012-08-22 15:51:47.013241342 +0200
-@@ -53,7 +53,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
- 	-I$(top_srcdir)/include \
- 	${XSERVERLIBS_CFLAGS} -I$(includedir)
- 
--libvnc_la_LDFLAGS = -module -avoid-version
-+libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
- 
- libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS)
- 
diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index d16a416..f1fef8d 100644
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -2,7 +2,7 @@
 
 Name: tigervnc
 Version: @VERSION@
-Release: 18%{?snap:.%{snap}}%{?dist}
+Release: 19%{?snap:.%{snap}}%{?dist}
 Summary: A TigerVNC remote display system
 
 Group: User Interface/Desktops
@@ -14,7 +14,7 @@
 Source1: vncserver.service
 Source2: vncserver.sysconfig
 Source6: vncviewer.desktop
-Source11: http://fltk.org/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz
+Source11: http://fltk.org/pub/fltk/1.3.3/fltk-1.3.3-source.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libX11-devel, automake, autoconf, libtool, gettext, gettext-devel
@@ -46,7 +46,6 @@
 Obsoletes: tightvnc < 1.5.0-0.15.20090204svn3586
 
 Patch4: tigervnc-cookie.patch
-Patch10: tigervnc11-ldnow.patch
 Patch11: tigervnc11-gethomedir.patch
 Patch16: tigervnc-xorg-manpages.patch
 
@@ -140,16 +139,9 @@
 
 # sed -i -e 's/80/0/g' CMakeLists.txt
 %patch4 -p1 -b .cookie
-%patch10 -p1 -b .ldnow
 %patch11 -p1 -b .gethomedir
 
 tar xzf %SOURCE11
-pushd fltk-*
-for p in `find ../contrib/fltk -maxdepth 1 -type f -name "*.patch"|sort` ;
-do
-  patch -p1 -i $p
-done
-popd
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver
 pushd unix/xserver
@@ -186,8 +178,8 @@
 %{cmake28} -G"Unix Makefiles" \
   -DBUILD_STATIC=off \
   -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-  -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
-  -DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.2
+  -DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.3/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.3/lib/libfltk_images.a;-lpng" \
+  -DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.3
 make LDFLAGS="-lpng" %{?_smp_mflags}
 
 pushd unix/xserver
@@ -344,6 +336,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Feb 19 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.80-19
+- Bumped fltk version to 1.3.3, no longer requires any patching
+
 * Tue Nov 04 2014 Brian P. Hinz <bphinz@users.sourceforge.net> 1.3.80-18.20131128svn5139
 - Bumped xserver patch to keep pace with native version