diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/conf/cygwin.def wfdb-10.4.11/conf/cygwin.def
--- wfdb-10.4.10/conf/cygwin.def	2005-08-08 07:09:13.000000000 -0400
+++ wfdb-10.4.11/conf/cygwin.def	2008-11-19 14:49:13.000000000 -0500
@@ -1,5 +1,5 @@
 # file: cygwin.def		G. Moody	6 June 2000
-#				Last revised:  8 August 2005
+#				Last revised: 19 November 2008
 #
 # This file contains default 'make' definitions for compiling the WFDB Software
 # Package under MS Windows using the free Cygwin/gcc ANSI C compiler, available
@@ -51,8 +51,8 @@
 INFODIR = $(WFDBROOT)/info
 
 # LIBDIR specifies the name of a directory in which to install the WFDB
-# library.
-LIBDIR = $(WFDBROOT)/lib
+# library.  Under Windows, this is the same as BINDIR (above).
+LIBDIR = $(WFDBROOT)/bin
 
 # MANDIR is the root of the man page directory tree.  On most systems, this is
 # something like /usr/man or /usr/local/man (type 'man man' to find out).
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/conf/cygwin-slib.def wfdb-10.4.11/conf/cygwin-slib.def
--- wfdb-10.4.10/conf/cygwin-slib.def	2006-04-07 10:04:16.000000000 -0400
+++ wfdb-10.4.11/conf/cygwin-slib.def	2008-11-19 16:06:38.000000000 -0500
@@ -1,5 +1,5 @@
 # file: cygwin-slib.def	I. Henry and G. Moody	19 November 2002
-#				Last revised:	 5 August 2005
+#				Last revised:	19 November 2008
 
 # This section contains settings suitable for generating a DLL (shared library)
 # under MS Windows using the free Cygwin/gcc ANSI C compiler, available from
@@ -48,8 +48,8 @@
 INCDIR = $(WFDBROOT)/include
 
 # LIBDIR specifies the name of a directory in which to install the WFDB
-# library.
-LIBDIR = $(WFDBROOT)/lib
+# library.  Under Windows, this is the same as BINDIR (above).
+LIBDIR = $(WFDBROOT)/bin
 
 # LDFLAGS is appended to the C compiler command line to specify loading the
 # WFDB library.
@@ -145,13 +145,3 @@
 	rm -f $(BINDIR)/$(WFDBLIB_DLLNAME)
 	
 #______________________________________________________________________________
-
-
-
-
-
-
-
-
-
-
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/conf/mingw.def wfdb-10.4.11/conf/mingw.def
--- wfdb-10.4.10/conf/mingw.def	2005-08-05 20:00:07.000000000 -0400
+++ wfdb-10.4.11/conf/mingw.def	2008-11-19 16:05:26.000000000 -0500
@@ -1,5 +1,5 @@
 # file: mingw.def		I. Henry and G. Moody       11 February 2005 
-#				Last revised:		     5 August 2005
+#				Last revised:		    19 November 2008
 #
 # This file contains default 'make' definitions for compiling the WFDB Software
 # Package under MS Windows using the free Mininmalist GNU for Windows (MinGW) 
@@ -52,8 +52,8 @@
 INFODIR = $(WFDBROOT)/info
 
 # LIBDIR specifies the name of a directory in which to install the WFDB
-# library.
-LIBDIR = $(WFDBROOT)/lib
+# library.  Under Windows, this is the same as BINDIR (above).
+LIBDIR = $(WFDBROOT)/bin
 
 # MANDIR is the root of the man page directory tree.  On most systems, this is
 # something like /usr/man or /usr/local/man (type 'man man' to find out).
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/conf/mingw-slib.def wfdb-10.4.11/conf/mingw-slib.def
--- wfdb-10.4.10/conf/mingw-slib.def	2005-08-05 15:15:56.000000000 -0400
+++ wfdb-10.4.11/conf/mingw-slib.def	2008-11-19 16:06:48.000000000 -0500
@@ -1,5 +1,5 @@
 # file: mingw-slib.def	I. Henry and G. Moody	11 February 2005
-#				Last revised:	  8 June 2005
+#				Last revised:	19 November 2008
 #
 # This section contains settings suitable for generating a DLL (shared library)
 # under MS Windows using the free gcc ANSI C compiler.
@@ -46,8 +46,8 @@
 INCDIR = $(WFDBROOT)/include
 
 # LIBDIR specifies the name of a directory in which to install the WFDB
-# library.
-LIBDIR = $(WFDBROOT)/lib
+# library.  Under Windows, this is the same as BINDIR (above).
+LIBDIR = $(WFDBROOT)/bin
 
 # CC is the name of your C compiler ('configure' will modify this).
 CC = gcc NOCYGWIN
@@ -132,15 +132,4 @@
 	rm -f $(LIBDIR)/$(WFDBLIB_SONAME)
 	rm -f $(BINDIR)/$(WFDBLIB_DLLNAME)
 
-
 #______________________________________________________________________________
-
-
-
-
-
-
-
-
-
-
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/conf/version.def wfdb-10.4.11/conf/version.def
--- wfdb-10.4.10/conf/version.def	2008-10-31 14:12:05.000000000 -0400
+++ wfdb-10.4.11/conf/version.def	2008-11-19 13:35:00.000000000 -0500
@@ -1,11 +1,11 @@
 # file: version.def		G. Moody	24 May 2000
-#				Last revised:	31 October 2008
+#				Last revised:	19 November 2008
 # Each release of the WFDB Software Package is identified by a three-part
 # version number, defined below.  Be sure to leave a single space before
 # and after the "=" in each of the next three lines!
-MAJOR = 10
-MINOR = 4
-RELEASE = 10
+MAJOR = VMAJ
+MINOR = VMIN
+RELEASE = VREL
 VERSION = $(MAJOR).$(MINOR).$(RELEASE)
 
 # RPMRELEASE can be incremented if changes are made between official
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/configure wfdb-10.4.11/configure
--- wfdb-10.4.10/configure	2008-10-07 16:07:33.000000000 -0400
+++ wfdb-10.4.11/configure	2008-11-19 14:52:23.000000000 -0500
@@ -1,6 +1,6 @@
 #! /bin/sh
 # file: configure             G. Moody         24 May 2000
-#                             Last revised:   7 October 2008
+#                             Last revised:  19 November 2008
 # Configuration script for the WFDB Software Package
 
 # This script was not generated using 'autoconf'.  If you can implement
@@ -74,6 +74,11 @@
 done
 
 echo "Checking the operating system type ..."
+CPUOS=`uname -m`-`uname -s`
+ARCH=`echo $CPUOS | tr -d " "`
+case $OS in
+ mingw*) 
+esac
 case `uname` in
   Linux*)    case `uname -m` in
 	        x86_64) OS=Linux-64 ;;
@@ -86,10 +91,14 @@
   CYGWIN*)   if [ "x$NOCYGWIN" = "xyes" ]
              then
 	         OS=mingw-compat
+		 T=`echo $ARCH | sed s/CYGWIN/MINGW/`
+		 ARCH=$T
              else
 	         OS=cygwin
              fi ;;
-  MINGW*)    OS=mingw ;;
+  MINGW*)    OS=mingw
+             T=`echo $ARCH | sed s/CYGWIN/MINGW/`
+             ARCH=$T ;;
   Darwin*)   OS=Darwin ;;
   *)         OS=generic ;;
 esac
@@ -110,13 +119,32 @@
 rm echo.out
 
 PACKAGE=`basename "$SRCDIR"`
-cp version.def site.def
+MAJOR=
+MINOR=
+RELEASE=
+case $PACKAGE in
+ wfdb-*)  MAJOR=`echo $PACKAGE | cut -c6- | cut -d . -f 1`
+	  MINOR=`echo $PACKAGE | cut -c6- | cut -d . -f 2`	  
+	  RELEASE=`echo $PACKAGE | cut -c6- | cut -d . -f 3` ;;
+ *)       ./prompt "Major version number: "; read MAJOR
+          ./prompt "Minor version number: "; read MINOR
+          ./prompt "Release number: "; read RELEASE ;;
+esac
+
+if [ "x$MAJOR" = "x" ]; then MAJOR=0; fi
+if [ "x$MINOR" = "x" ]; then MINOR=0; fi
+if [ "x$RELEASE" = "x" ]; then RELEASE=0; fi
+
+sed s/VMAJ/$MAJOR/ <version.def | sed s/VMIN/$MINOR/ | \
+ sed s/VREL/$RELEASE/ >site.def
 echo "# Definitions generated by 'configure'" >>site.def
 echo >>site.def
 echo "PACKAGE = $PACKAGE" >>site.def
 echo "SRCDIR = \"$SRCDIR\"" >>site.def
 echo LONGDATE = `date '+%e %B %Y'` >>site.def
 echo SHORTDATE = `date '+%B %Y' | tr a-z A-Z` >>site.def
+echo "ARCH = $ARCH" >>site.def
+
 echo "# _____________________________________________________________________________" >>site.def
 echo >>site.def
 
@@ -151,13 +179,16 @@
 	cat site.def hpux-slib.def >site-slib.def
 	cat hpux.def >>site.def ;;
   cygwin)
+	LIB=bin
 	cat site.def cygwin-slib.def >site-slib.def
 	cat cygwin.def >>site.def ;;
   mingw)
+	LIB=bin
 	WAVE=0
 	sed 's/NOCYGWIN//' site.def mingw-slib.def >site-slib.def
 	sed 's/NOCYGWIN//' mingw.def >>site.def ;;
   mingw-compat)
+	LIB=bin
 	OS=mingw
 	WAVE=0
 	sed 's/NOCYGWIN/-mno-cygwin/' site.def mingw-slib.def >site-slib.def
@@ -415,13 +446,9 @@
 	   WITHNF=without
 	   ;;
 esac
-
 echo "NETFILES=$NETFILES" >../config.cache
 echo "NETFILES_LIBCURL=$NETFILES_LIBCURL" >>../config.cache
-MAJOR=`grep ^MAJOR ../conf/version.def | cut -f 3 -d " "`
-MINOR=`grep ^MINOR ../conf/version.def | cut -f 3 -d " "`
-RELEASE=`grep ^RELEASE ../conf/version.def | cut -f 3 -d " "`
-echo "MAJOR = $MAJOR, MINOR = $MINOR, RELEASE = $RELEASE"
+
 sed "s/WFDB_NETFILES 1/WFDB_NETFILES $NETFILES/" < ../lib/wfdb.h0 | \
     sed "s/WFDBMAJOR/$MAJOR/" | \
     sed "s/WFDBMINOR/$MINOR/" | \
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/convert/edf2mit.c wfdb-10.4.11/convert/edf2mit.c
--- wfdb-10.4.10/convert/edf2mit.c	2008-10-27 15:56:28.000000000 -0400
+++ wfdb-10.4.11/convert/edf2mit.c	2008-11-18 11:49:21.000000000 -0500
@@ -1,5 +1,5 @@
 /* file: edf2mit.c		G. Moody       16 October 1996
-				Last revised:  27 October 2008
+				Last revised:  18 November 2008
 
 -------------------------------------------------------------------------------
 Convert EDF (European Data Format) file to MIT format header and signal files
@@ -209,13 +209,13 @@
 
     if (nsig < 1) exit(1);
 
-    if ((si = malloc(nsig * sizeof(WFDB_Siginfo))) == NULL ||
-	(spb = malloc(nsig * sizeof(int))) == NULL ||
-	(sigdmax = malloc(nsig * sizeof(long))) == NULL ||
-	(sigdmin = malloc(nsig * sizeof(long))) == NULL ||
-	(sigpmax = malloc(nsig * sizeof(double))) == NULL ||
-	(sigpmin = malloc(nsig * sizeof(double))) == NULL ||
-	(sampfreq = malloc(nsig * sizeof(double))) == NULL) {
+    if ((si = calloc(nsig, sizeof(WFDB_Siginfo))) == NULL ||
+	(spb = calloc(nsig, sizeof(int))) == NULL ||
+	(sigdmax = calloc(nsig, sizeof(long))) == NULL ||
+	(sigdmin = calloc(nsig, sizeof(long))) == NULL ||
+	(sigpmax = calloc(nsig, sizeof(double))) == NULL ||
+	(sigpmin = calloc(nsig, sizeof(double))) == NULL ||
+	(sampfreq = calloc(nsig, sizeof(double))) == NULL) {
 	fprintf(stderr, "%s: insufficient memory\n", pname);
 	exit(2);
     }      
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/install-wave32 wfdb-10.4.11/install-wave32
--- wfdb-10.4.10/install-wave32	2008-10-07 16:31:26.000000000 -0400
+++ wfdb-10.4.11/install-wave32	2008-11-19 14:38:10.000000000 -0500
@@ -18,7 +18,7 @@
 # the .h ("include") files associated with these libraries.  These components
 # fall into three categories:
 #
-#  1. 32-bit libraries an available from Fedora repositories
+#  1. 32-bit libraries available from Fedora repositories
 #     These include the standard C library, the X11 client libraries, the X11
 #     pixmap libraries, the libcurl (HTTP client) libraries, and their
 #     respective developer's toolkits.  The easiest way to install these on
@@ -58,3 +58,7 @@
 # Compile and install applications for remote control of WAVE.
 cd ../waverc
 make install
+
+# Clean up intermediate binaries and other temporary files.
+cd ..
+make clean
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/lib/Makefile.tpl wfdb-10.4.11/lib/Makefile.tpl
--- wfdb-10.4.10/lib/Makefile.tpl	2008-09-26 11:30:24.000000000 -0400
+++ wfdb-10.4.11/lib/Makefile.tpl	2008-11-19 16:03:59.000000000 -0500
@@ -1,5 +1,5 @@
 # file: Makefile.tpl		G. Moody	  24 May 2000
-#				Last revised:     26 September 2008
+#				Last revised:   19 November 2008
 # This section of the Makefile should not need to be changed.
 
 INCLUDES = $(INCDIR)/wfdb/wfdb.h $(INCDIR)/wfdb/ecgcodes.h \
@@ -25,7 +25,7 @@
 # 'make collect':  retrieve the installed WFDB library and headers
 collect:
 	../conf/collect.sh $(INCDIR)/wfdb wfdb.h ecgcodes.h ecgmap.h
-	../conf/collect.sh $(LIBDIR) $(WFDBLIB)
+	../conf/collect.sh $(LIBDIR) $(WFDBLIB) $(WFDBLIB_DLLNAME)
 	../conf/collect.sh $(BINDIR) wfdb-config
 
 uninstall:
@@ -56,17 +56,9 @@
 listing:
 	$(PRINT) README $(MFILES) $(HFILES) $(CFILES) wfdb-config.c
 
-# Rules for creating installation directories
-$(BINDIR):
-	mkdir -p $(BINDIR); $(SETDPERMISSIONS) $(BINDIR)
-$(INCDIR):
-	mkdir -p $(INCDIR); $(SETDPERMISSIONS) $(INCDIR)
-$(INCDIR)/wfdb:	$(INCDIR)
-	mkdir -p $(INCDIR)/wfdb; $(SETDPERMISSIONS) $(INCDIR)/wfdb
-$(INCDIR)/ecg:	$(INCDIR)
-	mkdir -p $(INCDIR)/ecg; $(SETDPERMISSIONS) $(INCDIR)/ecg
-$(LIBDIR):
-	mkdir -p $(LIBDIR); $(SETDPERMISSIONS) $(LIBDIR)
+# Rule for creating installation directories
+$(BINDIR) $(INCDIR) $(INCDIR)/wfdb $(INCDIR)/ecg $(LIBDIR):
+	mkdir -p $@; $(SETDPERMISSIONS) $@
 
 # Rules for installing the include files
 $(INCDIR)/wfdb/wfdb.h:		$(INCDIR)/wfdb wfdb.h
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/lib/wfdb.h wfdb-10.4.11/lib/wfdb.h
--- wfdb-10.4.10/lib/wfdb.h	2008-10-31 14:50:10.000000000 -0400
+++ wfdb-10.4.11/lib/wfdb.h	2008-11-19 21:03:17.000000000 -0500
@@ -33,7 +33,7 @@
 /* WFDB library version. */
 #define WFDB_MAJOR   10
 #define WFDB_MINOR   4
-#define WFDB_RELEASE 10
+#define WFDB_RELEASE 11
 #define WFDB_NETFILES 1	/* if 1, library includes code for HTTP, FTP clients */
 #define WFDB_NETFILES_LIBCURL 1
 
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/Makefile.tpl wfdb-10.4.11/Makefile.tpl
--- wfdb-10.4.10/Makefile.tpl	2008-10-10 11:06:05.000000000 -0400
+++ wfdb-10.4.11/Makefile.tpl	2008-11-19 14:08:43.000000000 -0500
@@ -128,14 +128,12 @@
 # 'make bin-tarball': make a gzipped tar archive of the WFDB software package
 # binaries and other installed files
 bin-tarball:	install collect
-	cp conf/archname /tmp; chmod +x /tmp/archname
-	rm -rf /tmp/$(PACKAGE)-`/tmp/archname`
-	mv /tmp/wfdb /tmp/$(PACKAGE)-`/tmp/archname`
-	cd /tmp; tar cfvz $(PACKAGE)-`/tmp/archname`.tar.gz \
-	 $(PACKAGE)-`/tmp/archname`
-	mv /tmp/$(PACKAGE)-`/tmp/archname`.tar.gz ..
-	rm -rf /tmp/$(PACKAGE)-`/tmp/archname`
-	rm -f /tmp/archname
+	rm -rf /tmp/$(PACKAGE)-$(ARCH)
+	mv /tmp/wfdb /tmp/$(PACKAGE)-$(ARCH)
+	cd /tmp; tar cfvz $(PACKAGE)-$(ARCH).tar.gz \
+	 $(PACKAGE)-$(ARCH)
+	mv /tmp/$(PACKAGE)-$(ARCH).tar.gz ..
+	rm -rf /tmp/$(PACKAGE)-$(ARCH)
 
 # 'make doc-tarball': make a gzipped tar archive of formatted documents
 # (requires many freely-available utilities that are not part of this
diff -Naur --exclude Makefile --exclude info wfdb-10.4.10/NEWS wfdb-10.4.11/NEWS
--- wfdb-10.4.10/NEWS	2008-10-31 14:55:29.000000000 -0400
+++ wfdb-10.4.11/NEWS	2008-11-19 22:53:40.000000000 -0500
@@ -1,3 +1,6 @@
+10.4.11:
+	Build process improvements, especially on Cygwin and MinGW targets.
+
 10.4.10:
 	EDF digital maximum and minimum values are now read properly in 64-bit
 	builds;  previous versions had a bug in edfparse (an internal WFDB