diff --git a/bootstrap.sh b/bootstrap.sh
index 5ee8e6c..a2e8c1f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,12 +2,15 @@
 #
 # This file should remain OS independent
 #
-# $Id: bootstrap.sh,v 1.3 2012/02/09 02:07:12 clem Exp $
+# $Id: bootstrap.sh,v 1.4 2012/06/13 01:18:04 clem Exp $
 #
 # @Copyright@
 # @Copyright@
 #
 # $Log: bootstrap.sh,v $
+# Revision 1.4  2012/06/13 01:18:04  clem
+# i can't say if it really works but the binary are there, aka it compiles
+#
 # Revision 1.3  2012/02/09 02:07:12  clem
 # added $ROLLSROOT variable to bootstrap-functions.sh
 #
@@ -20,6 +23,8 @@
 
 . $ROLLSROOT/etc/bootstrap-functions.sh
 
+yum --enablerepo base install imake
+
 compile_and_install rocks-vmd
 /sbin/ldconfig
 
diff --git a/src/netcdf/Makefile b/src/netcdf/Makefile
index 5ebd1e4..1f4d631 100644
--- a/src/netcdf/Makefile
+++ b/src/netcdf/Makefile
@@ -1,10 +1,13 @@
 #
-# $Id: Makefile,v 1.1 2012/01/28 03:09:38 nadya Exp $
+# $Id: Makefile,v 1.2 2012/06/13 01:18:06 clem Exp $
 #
 # @Copyright@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.2  2012/06/13 01:18:06  clem
+# i can't say if it really works but the binary are there, aka it compiles
+#
 # Revision 1.1  2012/01/28 03:09:38  nadya
 # initial, moving from cadd/
 #
@@ -26,7 +29,7 @@ build:
 		export CC="/usr/bin/gcc -fPIC";			\
 		export FC=/usr/bin/gfortran;				\
 		./configure --prefix=$(PKGROOT);		\
-		make check					\
+		make \
 	)
 	
 
diff --git a/src/vmd/Makefile b/src/vmd/Makefile
index 0bbc220..64f7184 100644
--- a/src/vmd/Makefile
+++ b/src/vmd/Makefile
@@ -1,10 +1,13 @@
 #
-# $Id: Makefile,v 1.1 2012/02/02 17:27:25 nadya Exp $
+# $Id: Makefile,v 1.2 2012/06/13 01:18:07 clem Exp $
 #
 # @Copyright@
 # @Copyright@
 #
 # $Log: Makefile,v $
+# Revision 1.2  2012/06/13 01:18:07  clem
+# i can't say if it really works but the binary are there, aka it compiles
+#
 # Revision 1.1  2012/02/02 17:27:25  nadya
 # move vmd to its own roll
 #
@@ -40,8 +43,8 @@ build:
 	cd $(NAME)-$(VERSION); \
 		export TCL_INCLUDE_DIR=/usr/include; \
 		export TCL_LIBRARY_DIR=/usr/lib; \
-		export PYTHON_INCLUDE_DIR=/usr/include/python2.4; \
-		export PYTHON_LIBRARY_DIR=/usr/lib/python2.4; \
+		export PYTHON_INCLUDE_DIR=/usr/include/python2.6; \
+		export PYTHON_LIBRARY_DIR=/usr/lib/python2.6; \
 		export VMDINSTALLBINDIR=${PKGROOT}/bin; \
 		export VMDINSTALLLIBRARYDIR=${PKGROOT};\
 		./configure $(VMDARCH) OPENGL FLTK NETCDF TK TCL IMD SILENT PTHREADS PYTHON ;\
diff --git a/src/vmd/patch-files/plugins/Make-arch b/src/vmd/patch-files/plugins/Make-arch
deleted file mode 100755
index d598be6..0000000
--- a/src/vmd/patch-files/plugins/Make-arch
+++ /dev/null
@@ -1,574 +0,0 @@
-##
-## Per-architecture plugin compilation rules 
-## Copyright 2002, Board of Trustees of the University of Illinois
-## Theoretical Biophysics Group
-##
-
-make-arch-help:
-	@echo "Type 'make arch' where arch is one of the platforms listed below:"
-	@echo "--------------------------------------"
-	@echo " AIX4"
-	@echo " AIX5"
-	@echo " AIX5_64"
-	@echo " AIX6_64"
-	@echo " FREEBSD"
-	@echo " FREEBSDAMD64"
-	@echo " HPUX11"
-	@echo " IRIX6"
-	@echo " IRIX6_64"
-	@echo " LINUX"
-	@echo " LINUXALPHA"
-	@echo " LINUXAMD64"
-	@echo " LINUXPPC"
-	@echo " LINUXPPC64"
-	@echo " LINUXIA64"
-	@echo " MACOSX"
-	@echo " MACOSXX86"
-	@echo " MACOSXX86_64"
-	@echo " NETBSD"
-	@echo " SOLARIS2"
-	@echo " SOLARIS2_64"
-	@echo " SOLARISX86"
-	@echo " SOLARISX86_64"
-	@echo " TRU64"
-	@echo " T3E"
-	@echo " WIN32"
-	@echo " WIN32-debug"
-	@echo " WIN64"
-	@echo "--------------------------------------"
-	@echo "Type 'make clean' to clean the compilation area"
-	@echo "Type 'make arch OPT=myopt' to specfy additional options."
-	@echo "Options include: "
-	@echo "  TCLINC: Include path for Tcl"
-	@echo "  TCLLIB: Library path for Tcl"
-
-
-AIX4:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = AIX4" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = xlc" \
-	"CXX = xlC" \
-	"DEF = -D" \
-	"CCFLAGS = -w -qinlglue -qarch=com -qtune=pwr3" \
-	"CXXFLAGS = -w -qstrict -Q -qarch=com -qtune=pwr3" \
-	"LDFLAGS = -qarch=com -qtune=pwr3" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf" \
-	"AR = ar" \
-	"NM = nm -B" \
-	"RANLIB = touch" \
-	"SHLD = xlC -bM:SRE -bnoentry -bexpall -lm -qarch=com -qtune=pwr3"
-
-AIX5:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = AIX5" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = xlc" \
-	"CXX = xlC" \
-	"DEF = -D" \
-	"CCFLAGS = -w -qinlglue -qarch=com -qtune=pwr5" \
-	"CXXFLAGS = -w -qstrict -Q -qarch=com -qtune=pwr5" \
-	"LDFLAGS = -qarch=com -qtune=pwr5" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf" \
-	"AR = ar" \
-	"NM = nm -B" \
-	"RANLIB = touch" \
-	"SHLD = xlC -bM:SRE -bnoentry -bexpall -lm -qarch=com -qtune=pwr5"
-
-AIX5_64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = AIX5_64" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = xlc" \
-	"CXX = xlC" \
-	"DEF = -D" \
-	"CCFLAGS = -w -qinlglue -q64 -qarch=com -qtune=pwr5" \
-	"CXXFLAGS = -w -qstrict -Q -q64 -qarch=com -qtune=pwr5" \
-	"LDFLAGS = -q64 -qarch=com -qtune=pwr5" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf" \
-	"AR = ar -X64" \
-	"NM = nm -B" \
-	"RANLIB = touch" \
-	"SHLD = xlC -bM:SRE -bnoentry -bexpall -lm -q64 -qarch=com -qtune=pwr5"
-
-AIX6_64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = AIX6_64" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = xlc" \
-	"CXX = xlC" \
-	"DEF = -D" \
-	"CCFLAGS = -w -qinlglue -q64 -qarch=com -qtune=pwr5" \
-	"CXXFLAGS = -w -qstrict -Q -q64 -qarch=com -qtune=pwr5" \
-	"LDFLAGS = -q64 -qarch=com -qtune=pwr5" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf" \
-	"AR = ar -X64" \
-	"NM = nm -B" \
-	"RANLIB = touch" \
-	"SHLD = xlC -bM:SRE -bnoentry -bexpall -lm -q64 -qarch=com -qtune=pwr5"
-
-BLUEWATERS:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = BLUEWATERS" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = xlc_r -w" \
-	"CXX = xlC_r -w" \
-	"DEF = -D" \
-	"CCFLAGS = -DARCH_BLUEWATERS -qsuppress=1500-036 -O3 -qaggrcopy=nooverlap -qalias=ansi -qarch=auto -qtune=auto" \
-	"CXXFLAGS = -DARCH_BLUEWATERS -qsuppress=1500-036 -O3 -qaggrcopy=nooverlap -qalias=ansi -qarch=auto -qtune=auto" \
-	"TCLLDFLAGS = -ltcl8.5 -ldl" \
-	"NETCDFLDFLAGS = " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = xlC -qmkshrobj -lm -q64 -qarch=auto -qtune=auto"
-
-T3E:
-	$(MAKE) staticlibs \
-	"ARCH = T3E" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc" \
-	"CXX = CC" \
-	"DEF = -D" \
-	"CCFLAGS = -O2" \
-	"CXXFLAGS = -O2" \
-	"LDFLAGS = " \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf" \
-	"AR = ar" \
-	"NM = nm" \
-	"RANLIB = touch" \
-	"SHLD = echo"
- 
-IRIX6:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = IRIX6" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc -n32 -mips3 -KPIC" \
-	"CXX = CC -n32 -mips3 -KPIC" \
-	"DEF = -D" \
-	"CCFLAGS = -O2 -fullwarn" \
-	"CXXFLAGS = -O2 -fullwarn" \
-	"LDFLAGS = -n32 -mips3" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = cc -shared"
- 
-IRIX6_64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = IRIX6_64" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc -64 -mips4 -KPIC" \
-	"CXX = CC -64 -mips4 -KPIC" \
-	"DEF = -D" \
-	"CCFLAGS = -O2 -fullwarn" \
-	"CXXFLAGS = -O2 -fullwarn" \
-	"LDFLAGS = -64 -mips4" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = cc -shared -64 -mips4"
- 
-SOLARIS2:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = SOLARIS2" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc -mt -fast -xarch=v8plusa" \
-	"CXX = CC -mt -fast -xarch=v8plusa" \
-	"DEF = -D" \
- 	"CCFLAGS = -KPIC " \
- 	"CXXFLAGS = -KPIC " \
-	"TCLLDFLAGS = -ltcl8.5 -lsocket -lnsl -ldl" \
-	"NETCDFLDFLAGS = -lnetcdf -lsocket -lnsl -ldl" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = cc -mt -fast -xarch=v8plusa -G"
-
-SOLARIS2_64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = SOLARIS2_64" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc -D__EXTENSIONS__ -fast -mt -xarch=v9a" \
-	"CXX = CC -D__EXTENSIONS__ -fast -mt -xarch=v9a" \
-	"DEF = -D" \
- 	"CCFLAGS = -KPIC " \
- 	"CXXFLAGS = -KPIC " \
-	"TCLLDFLAGS = -ltcl8.5 -lsocket -lnsl -ldl" \
-	"NETCDFLDFLAGS = -lnetcdf -lsocket -lnsl -ldl" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = cc -D__EXTENSIONS__ -xarch=v9a -G"
-
-SOLARISX86:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = SOLARISX86" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc -mt -fast -xarch=native" \
-	"CXX = CC -mt -fast -xarch=native" \
-	"DEF = -D" \
- 	"CCFLAGS = -KPIC " \
- 	"CXXFLAGS = -KPIC " \
-	"TCLLDFLAGS = -ltcl8.5 -lsocket -lnsl -ldl" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = cc -mt -fast -xarch=native -G"
-
-SOLARISX86_64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = SOLARISX86_64" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc -D__EXTENSIONS__ -fast -mt -xarch=native64" \
-	"CXX = CC -D__EXTENSIONS__ -fast -mt -xarch=native64" \
-	"DEF = -D" \
- 	"CCFLAGS = -KPIC " \
- 	"CXXFLAGS = -KPIC " \
-	"TCLLDFLAGS = -ltcl8.5 -lsocket -lnsl -ldl" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = cc -D__EXTENSIONS__ -xarch=native64 -G"
-
-TRU64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = TRU64" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc" \
-	"CXX = cxx" \
-	"DEF = -D" \
- 	"CCFLAGS = -fast" \
- 	"CXXFLAGS = -fast" \
-	"TCLLDFLAGS = -ltcl8.5 -lm" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -B" \
-	"RANLIB = touch" \
-	"SHLD = ld -shared"
-
-FREEBSD:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = FREEBSD" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = gcc" \
-	"CXX = g++" \
-	"DEF = -D" \
-	"CCFLAGS = -O2 -Wall -I/usr/local/include/tcl8.5" \
-	"CXXFLAGS = -O2 -Wall" \
-	"TCLLDFLAGS = -L/usr/local/lib -ltcl85" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = gcc -shared"
-
-FREEBSDAMD64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = FREEBSD" \
-	"COPTO = -fPIC -m64 -o " \
-	"LOPTO = -fPIC -m64 -o " \
-	"CC = gcc" \
-	"CXX = g++" \
-	"DEF = -D" \
-	"CCFLAGS = -m64 -O2 -Wall -I/usr/local/include/tcl8.5" \
-	"CXXFLAGS = -m64 -O2 -Wall" \
-	"TCLLDFLAGS = -L/usr/local/lib -ltcl85" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = gcc -shared"
-
-HPUX11:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = HPUX11" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = cc" \
-	"CXX = aCC" \
-	"DEF = -D" \
-	"CCFLAGS = +O2 +DAportable -Ae +z" \
-	"CXXFLAGS = +O2 +DAportable +z" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = ld -b"
-
-
-LINUX:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = LINUX" \
-	"COPTO = -fPIC -m32 -o " \
-	"LOPTO = -fPIC -m32 -o " \
-	"CC = gcc" \
-	"CXX = g++" \
-	"DEF = -D" \
-	"CCFLAGS = -m32 -O2 -fPIC -Wall" \
-	"CXXFLAGS = -m32 -O2 -fPIC -Wall" \
-	"TCLLDFLAGS = -ltcl8.5 -ldl" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = gcc -shared"
-	
-LINUXALPHA:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = LINUXALPHA" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = ccc" \
-	"CXX = cxx" \
-	"DEF = -D" \
-	"CCFLAGS = -O4 -arch host -tune host" \
-	"CXXFLAGS = -O4 -arch host -tune host" \
-	"TCLLDFLAGS = -ltcl8.5 -ldl" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = gcc -shared"
-
-LINUXAMD64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = LINUXAMD64" \
-	"COPTO = -fPIC -m64 -o " \
-	"LOPTO = -fPIC -m64 -o " \
-	"CC = gcc" \
-	"CXX = g++" \
-	"DEF = -D" \
-	"CCFLAGS = -m64 -O2 -fPIC -Wall" \
-	"CXXFLAGS = -m64 -O2 -fPIC -Wall" \
-	"TCLLDFLAGS = -ltcl8.4 -ldl" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = gcc -shared"
-	
-LINUXPPC:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = LINUXPPC" \
-	"COPTO = -fPIC -o " \
-	"LOPTO = -fPIC -o " \
-	"CC = gcc" \
-	"CXX = g++" \
-	"DEF = -D" \
-	"CCFLAGS = -O2 -fPIC -Wall" \
-	"CXXFLAGS = -O2 -fPIC -Wall" \
-	"TCLLDFLAGS = -ltcl8.5 -ldl" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = gcc -shared"
-
-LINUXPPC64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = LINUXPPC64" \
-	"COPTO = -fPIC -m64 -o " \
-	"LOPTO = -fPIC -m64 -o " \
-	"CC = gcc" \
-	"CXX = g++" \
-	"DEF = -D" \
-	"CCFLAGS = -m64 -O2 -fPIC -Wall" \
-	"CXXFLAGS = -m64 -O2 -fPIC -Wall" \
-	"TCLLDFLAGS = -ltcl8.5 -ldl" \
-	"NETCDFLDFLAGS = " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = gcc -shared"
-
-LINUXIA64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = LINUXIA64" \
-	"COPTO = -fPIC -o " \
-	"LOPTO = -fPIC -o " \
-	"CC = cc" \
-	"CXX = c++" \
-	"DEF = -D" \
-	"CCFLAGS = -O2 -fPIC -Wall" \
-	"CXXFLAGS = -O2 -fPIC -Wall" \
-	"TCLLDFLAGS = -ltcl8.5 -ldl" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = cc -shared"
-
-LINUXIA64-icc:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = LINUXIA64" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = icc" \
-	"CXX = icpc" \
-	"DEF = -D" \
-	"CCFLAGS = -O2 -fPIC" \
-	"CXXFLAGS = -O2 -fPIC" \
-	"TCLLDFLAGS = -ltcl8.5 -ldl" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = icc -shared"
-	
-MACOSX:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = MACOSX" \
-	"COPTO = -fPIC -o " \
-	"LOPTO = -fPIC -o " \
-	"CC = cc" \
-	"CXX = c++" \
-	"DEF = -D" \
-	"CCFLAGS = -Os -Wall -fPIC -dynamic" \
-	"CXXFLAGS = -Os -Wall -fPIC -dynamic" \
-	"TCLLDFLAGS = -framework Tcl" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = ranlib" \
-	"SHLD = c++ -bundle" \
-	"TCLSHLD = c++ -dynamiclib"
-
-MACOSXX86:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = MACOSXX86" \
-	"COPTO = -fPIC -o " \
-	"LOPTO = -fPIC -o " \
-	"CC = cc" \
-	"CXX = c++" \
-	"DEF = -D" \
-	"CCFLAGS = -Os -Wall -fPIC -dynamic" \
-	"CXXFLAGS = -Os -Wall -fPIC -dynamic" \
-	"TCLLDFLAGS = -framework Tcl" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = ranlib" \
-	"SHLD = c++ -bundle" \
-	"TCLSHLD = c++ -dynamiclib"
-
-MACOSXX86_64:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = MACOSXX86_64" \
-	"COPTO = -fPIC -o " \
-	"LOPTO = -fPIC -o " \
-	"CC = cc" \
-	"CXX = c++" \
-	"DEF = -D" \
-	"CCFLAGS = -m64 -Os -Wall -fPIC -dynamic" \
-	"CXXFLAGS = -m64 -Os -Wall -fPIC -dynamic" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = ranlib" \
-	"SHLD = c++ -bundle" \
-	"TCLSHLD = c++ -dynamiclib"
-
-NETBSD:
-	$(MAKE) dynlibs staticlibs bins \
-	"ARCH = NETBSD" \
-	"COPTO = -o " \
-	"LOPTO = -o " \
-	"CC = gcc" \
-	"CXX = g++" \
-	"DEF = -D" \
-	"CCFLAGS = -O2 -Wall -ansi" \
-	"CXXFLAGS = -O2 -Wall" \
-	"TCLLDFLAGS = -ltcl8.5" \
-	"NETCDFLDFLAGS = -lnetcdf " \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLD = gcc -shared"
-
-WIN32:
-	$(MAKE) dynlibs win32staticlibs win32bins \
-	"ARCH = WIN32" \
-	"COPTO = /Fo" \
-	"LOPTO = /OUT:" \
-	"CC = cl.exe /nologo /MT /DWIN32" \
-	"CXX = cl.exe /nologo /MT /TP /DWIN32" \
-	"DEF = /D" \
-	"CCFLAGS = /O2 /G5" \
-	"CXXFLAGS = /O2 /G5" \
-	"TCLLDFLAGS = tcl85.lib" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLDFLAGS = /D\"VMDPLUGIN_EXPORTS\"" \
-	"SHLD = link /DLL /nologo /incremental:no \
-		kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib \
-		advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
-		odbc32.lib odbccp32.lib ws2_32.lib wsock32.lib /OPT:REF"
-
-WIN32-debug:
-	$(MAKE) dynlibs win32staticlibs win32bins \
-	"ARCH = WIN32-debug" \
-	"COPTO = /Fo" \
-	"LOPTO = /OUT:" \
-	"CC = cl.exe /nologo /MTd /DWIN32" \
-	"CXX = cl.exe /nologo /MTd /TP /DWIN32" \
-	"DEF = /D" \
-	"CCFLAGS = /ZI /Od /G5 /D\"_DEBUG\"" \
-	"CXXFLAGS = /ZI /Od /G5 /D\"_DEBUG\"" \
-	"TCLLDFLAGS = tcl85.lib" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLDFLAGS = /D\"VMDPLUGIN_EXPORTS\"" \
-	"SHLD = link /DLL /nologo /incremental:no /debug /warn:4 \
-		kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib \
-		advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
-		odbc32.lib odbccp32.lib ws2_32.lib wsock32.lib /OPT:REF"
-
-
-WIN64:
-	$(MAKE) dynlibs win32staticlibs win32bins \
-	"ARCH = WIN64" \
-	"COPTO = /Fo" \
-	"LOPTO = /OUT:" \
-	"CC = cl.exe /nologo /MT /DWIN64" \
-	"CXX = cl.exe /nologo /MT /TP /DWIN64" \
-	"DEF = /D" \
-	"CCFLAGS =  /EHsc /Wp64 /wd4996 /O2 /D\"_CRT_SECURE_NO_DEPRECATE\"" \
-	"CXXFLAGS = /EHsc /Wp64 /wd4996 /O2 /D\"_CRT_SECURE_NO_DEPRECATE\"" \
-	"TCLLDFLAGS = tcl85.lib" \
-	"AR = ar" \
-	"NM = nm -p" \
-	"RANLIB = touch" \
-	"SHLDFLAGS = /D\"VMDPLUGIN_EXPORTS\"" \
-	"SHLD = link /DLL /nologo /incremental:no \
-		kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib \
-		advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
-		odbc32.lib odbccp32.lib ws2_32.lib wsock32.lib /MACHINE:X64 /OPT:REF"
-
-
diff --git a/src/vmd/patch-files/vmd-1.9/configure b/src/vmd/patch-files/vmd-1.9/configure
index 825440b..8f374c4 100755
--- a/src/vmd/patch-files/vmd-1.9/configure
+++ b/src/vmd/patch-files/vmd-1.9/configure
@@ -626,8 +626,8 @@ $tcl_include      = "-I$stock_tcl_include_dir";
 if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; }
 $tcl_library      = "-L$stock_tcl_library_dir";
 if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; }
-$tcl_libs         = "-ltcl8.4";  
-if ($config_tk) { $tcl_libs = "-ltk8.4 -lX11 " . $tcl_libs; }
+$tcl_libs         = "-ltcl8.5";  
+if ($config_tk) { $tcl_libs = "-ltk8.5 -lX11 " . $tcl_libs; }
 
 @tcl_cc           = ();
 @tcl_cu           = ();
@@ -1085,7 +1085,7 @@ $stock_numpy_library_dir=$ENV{"NUMPY_LIBRARY_DIR"} || "$vmd_library_dir/python/l
 $python_defines     = "-DVMDPYTHON";
 $python_include     = "-I$stock_python_include_dir -I$stock_numpy_include_dir -I$stock_numpy_library_dir";
 $python_library     = "-L$stock_python_library_dir";
-$python_libs        = "-lpython2.4 -lpthread";
+$python_libs        = "-lpython2.6 -lpthread";
 @python_h           = ('PythonTextInterp.h',
                        'VMDTkinterMenu.h',
 		       'py_commands.h',