Imported Upstream version 6.0.2

Change-Id: Ib1347d95bae5f16ba296e803788f3aa675a3b901 Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
author: DongHun Kwak <dh0128.kwak@samsung.com> 2016-10-20 10:34:45 +0900
committer: DongHun Kwak <dh0128.kwak@samsung.com> 2016-10-20 10:34:48 +0900
commit: bffd2540485d9fa5b17c38cac8f5c4ed376c442d (patch)
tree: 5ad5fd03f3cf8a3ae4999cd404d9fc1194646378
parent: 92129cc3165be4ab9f5b37e8969896201ec9033f (diff)
download: dos2unix-bffd2540485d9fa5b17c38cac8f5c4ed376c442d.tar.gz
dos2unix-bffd2540485d9fa5b17c38cac8f5c4ed376c442d.tar.bz2
dos2unix-bffd2540485d9fa5b17c38cac8f5c4ed376c442d.zip
30 files changed, 1007 insertions, 603 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 58c1dd6..91b7da0 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,52 @@
+2012-09-06 Erwin Waterlander <waterlan@xs4all.nl>
+	* Version 6.0.2
+
+2012-08-29 Erwin Waterlander <waterlan@xs4all.nl>
+	* wcc*: Fix target 'dist' in Watcom makefiles.
+	* djgpp.mak: Use 8.3 filename for dos32 binary package.
+
+2012-08-26 Erwin Waterlander <waterlan@xs4all.nl>
+	* os2.mak: Renamed to emx.mak.
+	* wccos2.mak: New Watcom C makefile for OS/2 target.
+	* wcc.mif: Watcom C makefile with generic parts. This new
+	  makefile containts new targets 'install', 'uninstall',
+	  'doc', 'dist', and 'mostlyclean'.
+	* djgpp.mak: Default prefix is now c:\dos32
+	* dos16_gnu.mak: Removed. Installation of dos16 version is
+	  now done with Watcom makefiles.
+
+2012-08-13 Erwin Waterlander <waterlan@xs4all.nl>
+	* po/de.po: Update German translations. Thanks to Philipp.
+	* po/es.po: Update Spanish translations. Thanks to Julio.
+
+2012-08-12 Erwin Waterlander <waterlan@xs4all.nl>
+	* Makefile: Don't use pod2text option --utf8. There are too many
+	  old pod2text versions around that don't support this option.
+	* Makefile: Install PDF and PostScript files of all languages when
+	  they have been created.
+	* po/eo*.po: Update Esperanto translations. Thanks to Rugxulo.
+	* dos2unix/unix2dos: Don't use __MSDOS__ macro for Windows.
+
+2012-08-10 Erwin Waterlander <waterlan@xs4all.nl>
+	* Makefile: Change variable OS to D2U_OS. OS is used by Windows.
+	* Makefile: By default install only English text and html manuals.
+	  This saves a dependency on iconv. Non-English text and html manuals
+	  will be installed when they have been explicitly generated with
+	  targets 'txt' and 'html'.
+
+2012-08-09 Erwin Waterlander <waterlan@xs4all.nl>
+	* dos2unix/unix2dos: Use only C99 compliant predefined macros.
+
+2012-08-07 Erwin Waterlander <waterlan@xs4all.nl>
+	* dos2unix/unix2dos: Print line number when a binary symbol is found.
+	  Thanks to Somsak Pattanaprateep.
+	* Makefile: By default install text and html manuals of all languages.
+
+2012-08-06 Erwin Waterlander <waterlan@xs4all.nl>
+	* dos2unix/unix2dos: Fix. Locale encoding was not detected when NLS
+	  was disabled.
+	* common.c: Update comments. Surrogate halves in UTF-8 are invalid.
+
 2012-07-25 Erwin Waterlander <waterlan@xs4all.nl>
 	* Version 6.0.1
 
@@ -391,7 +440,7 @@
 	  to Mac line endings.
 
 2010-02-10 Erwin Waterlander <waterlan@xs4all.nl>
-	* unix2dos: Makefile : 
+	* unix2dos: Makefile :
 	  - Use GNU standard directory variables everywhere.
 	  - New target 'dist-tbz' creates bzip2 compressed archive.
 
@@ -403,7 +452,7 @@
 	    this is more common practice).
 
 2010-02-03 Erwin Waterlander <waterlan@xs4all.nl>
-	* dos2unix: Makefile : 
+	* dos2unix: Makefile :
 	  - Use GNU standard directory variables everywhere.
 
 2010-02-03 Philipp Thomas <psmt@opensuse.org>
@@ -483,7 +532,7 @@
 	* dos2unix/unix2dos: Makefile: Makefile according GNU standards.
 	* unix2dos: INSTALL: New file.
 	* dos2unix: Applied all patches from RedHat:
-	  - use mkstemp i.s.o. mktemp: Nov 17 2000 Tim Powers <timp@redhat.com> 
+	  - use mkstemp i.s.o. mktemp: Nov 17 2000 Tim Powers <timp@redhat.com>
 	  - segfault: Jan 17 2002 Bernhard Rosenkraenzer <bero@redhat.com>
 	  - safeconv: Oct 20 2004 Miloslav Trmac <mitr@redhat.com>
 	  - manpage-update: Oct  6 2004 Mike A. Harris <mharris@redhat.com>
@@ -492,12 +541,12 @@
 	  - c-missing-arg: Jan 18 2008 Tim Waugh <twaugh@redhat.com>
 	  - Remove trailing white space.
 	* unix2dos: Applied all patches from RedHat:
-	  - use mkstemp i.s.o. mktemp: Nov 17 2000 Tim Powers <timp@redhat.com> 
+	  - use mkstemp i.s.o. mktemp: Nov 17 2000 Tim Powers <timp@redhat.com>
 	  - segfault: Jan 17 2002 Bernhard Rosenkraenzer <bero@redhat.com>
 	  - manpage-update: Oct  6 2004 Mike A. Harris <mharris@redhat.com>
 	  - preserve-file-modes: Oct 11 2004 Tim Waugh <twaugh@redhat.com>
 	  - tmppath: Apr 13 2005 Tim Waugh <twaugh@redhat.com>
-	  - Remove trailing white space. 
+	  - Remove trailing white space.
 
 1998-11-19 Christian Wurll <wurll@ira.uka.de>
 	* dos2unix: version 3.1
diff --git a/INSTALL.txt b/INSTALL.txt
index d70dcd0..ae9d46e 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -17,12 +17,14 @@ PREREQUISITES
             * groff       : GNU troff text formatting system.
             * ghostscript : An interpreter for the PostScript language and
                             for PDF (ps2pdf)
+            * iconv       : Character set conversion utility.
 
-    Alternative for Windows/DOS:
-        * Open Watcom : http://www.openwatcom.org/
 
-    Required for DOS16 bit:
-        * Open Watcom : http://www.openwatcom.org/
+    Using Watcom C:
+        Required
+            * Open Watcom  : http://www.openwatcom.org/
+            * perl         : Practical Extraction and Report Language (perlpod)
+
 
 
 BASIC INSTALLATION
@@ -47,8 +49,9 @@ BASIC INSTALLATION
         make clean
 
 
-        Mostly clean. The target mostlyclean will preserve the generated
-        documentation files.
+    Mostly clean.
+
+        The target mostlyclean will preserve the generated documentation files.
 
         make mostlyclean
 
@@ -64,6 +67,7 @@ INSTALLATION NAMES
         make prefix=$HOME clean all
         make prefix=$HOME install
 
+
 DEBUG
 
     A debug enabled build can be made by adding DEBUG=1
@@ -74,6 +78,7 @@ DEBUG
     With debug enabled dos2unix will print extra information
     and you can debug the source code in gdb.
 
+
 NATIVE LANGUAGE SUPPORT
 
     Native Language Support (NLS) is by default enabled.
@@ -81,6 +86,7 @@ NATIVE LANGUAGE SUPPORT
 
         make clean install ENABLE_NLS=
 
+
 LARGE FILE SUPPORT
 
     Large File Support (LFS) is by default enabled. This enables
@@ -92,6 +98,7 @@ LARGE FILE SUPPORT
         Disable LFS:
         make clean install LFS=
 
+
 UNICODE SUPPORT
 
     Unicode UTF-16 support is by default enabled for Windows and Unix.  To
@@ -100,28 +107,45 @@ UNICODE SUPPORT
         Disable Unicode:
         make clean install UCS=
 
-    Unicode UTF-16 is not supported by the DOS versions.
+    Unicode UTF-16 is not supported by the DOS and OS/2 versions.
 
 
 ESPERANTO X-NOTATION
 
     For systems that don't support the Unicode or Latin-3 character set,
     Esperanto messages in ASCII x-notation format can be selected. Add
-    EO_XNOTATION=1 tot the make command-line.  It will change the format of the
+    EO_XNOTATION=1 to the make command-line.  It will change the format of the
     normal dos2unix 'eo' locale from Unicode to ASCII x-notation.
 
         make clean install EO_XNOTATION=1
 
+
 DOCUMENTATION
 
-    Manual pages are generated from Perl POD files. By default
-    the manual pages are are created in text and html format.
-    To create a manual in PDF format type:
+    Manual pages are generated from Perl POD files.
+
+    The manual pages in text and html format are by default only
+    created in English language. To create text and html manuals
+    for other languages type:
+
+        make txt
+        make html
+
+    Once the manuals in non-English languages have been created,
+    they will also be installed under share/doc/ when you type
+    'make install'
+
+    Creation of non-English manuals in text or html format require
+    an installation of iconv.
+
+    Manuals in PDF format are by default not created.
+    To create manuals in PDF format type:
 
         make pdf
 
     PDF generation requires GhostScript to be installed.
 
+
 WINDOWS PORT
 
     To compile a version for Windows, get the Mingw compiler
@@ -132,11 +156,11 @@ WINDOWS PORT
         make -f mingw.mak strip
         make -f mingw.mak install
 
-    Or get the Open Watcom C compiler <http://www.openwatcom.org>
-    and type:
+    Or use Open Watcom and type:
 
         wmake -f wccwin32.mak clean
         wmake -f wccwin32.mak
+        wmake -f wccwin32.mak install
 
 
     The win32 binaries built with MinGW32 are packed with a patched version of
@@ -155,6 +179,7 @@ WINDOWS 64 BIT PORT
         make -f mingw64.mak strip
         make -f mingw64.mak install
 
+
 DOS PORT, 32 BIT
 
     To compile a version for DOS, get the DJGPP compiler
@@ -165,10 +190,12 @@ DOS PORT, 32 BIT
         make -f djgpp.mak strip
         make -f djgpp.mak install
 
-    Or use the OpenWatcom compiler <http://www.openwatcom.org>.
+    Or use Open Watcom
 
         wmake -f wccdos32.mak clean
         wmake -f wccdos32.mak
+        wmake -f wccdos32.mak install
+
 
 DOS PORT, 16 BIT
 
@@ -178,18 +205,25 @@ DOS PORT, 16 BIT
         make -f bcc.mak clean
         make -f bcc.mak
 
-    Or use the OpenWatcom compiler <http://www.openwatcom.org>.
+    Or use Open Watcom
 
         wmake -f wccdos16.mak clean
         wmake -f wccdos16.mak
+        wmake -f wccdos16.mak install
+
 
 OS/2 PORT
 
-    Using Paul Smedley's build environment, available
-    at <http://os2ports.smedley.info>
+    Using EMX
+
+        make -f emx.mak clean
+        make -f emx.mak
+        make -f emx.mak strip
+        make -f emx.mak install
+
+    Open Watcom
 
-        make -f os2.mak clean
-        make -f os2.mak
-        make -f os2.mak strip
-        make -f os2.mak install
+        wmake -f wccos2.mak clean
+        wmake -f wccos2.mak
+        wmake -f wccos2.mak install
 
diff --git a/Makefile b/Makefile
index e194ae5..74a3e11 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 #
 #   Copyright (C) 2009-2012 Erwin Waterlander
 #   All rights reserved.
-# 
+#
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #   are met:
@@ -11,7 +11,7 @@
 #   2. Redistributions in binary form must reproduce the above copyright
 #      notice in the documentation and/or other materials provided with
 #      the distribution.
-# 
+#
 #   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
 #   EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 #   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -35,6 +35,7 @@
 
 include version.mk
 
+
 CC		= gcc
 CPP		= cpp
 CPP_FLAGS_POD	= ALL
@@ -88,12 +89,19 @@ ifdef ENABLE_NLS
 endif
 
 HTMLEXT = htm
-DOCFILES	= $(PACKAGE).txt $(PACKAGE).$(HTMLEXT)
+# By default we generate only English text and html manuals.
+# Then we don't need "pod2text --utf8" and we have no dependency on iconv.
+DOCFILES	= man/man1/$(PACKAGE).txt man/man1/$(PACKAGE).$(HTMLEXT)
 INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
 
-#PODFILES	= man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)
+PODFILES_ALL	= man/man1/dos2unix.pod $(wildcard man/*/man1/dos2unix.pod)
 PODFILES	= $(wildcard man/*/man1/dos2unix.pod)
 MANFILES	= $(patsubst %.pod,%.1,$(PODFILES))
+TXTFILES	= $(patsubst %.pod,%.txt,$(PODFILES_ALL))
+HTMLFILES	= $(patsubst %.pod,%.$(HTMLEXT),$(PODFILES_ALL))
+PSFILES 	= $(patsubst %.pod,%.ps,$(PODFILES_ALL))
+PDFFILES	= $(patsubst %.pod,%.pdf,$(PODFILES_ALL))
+UTF8FILES	= $(patsubst %.pod,%.ut8,$(PODFILES_ALL))
 
 # On some systems (e.g. FreeBSD 4.10) GNU install is installed as `ginstall'.
 INSTALL		= install
@@ -109,21 +117,21 @@ VERSIONSUFFIX	= -bin
 
 # ......................................................... OS flags ...
 
-OS =
+D2U_OS =
 
-ifndef OS
-ifneq (, $(wildcard /boot/vmlinuz*))
-	OS = linux
+ifndef D2U_OS
+ifeq (Linux, $(shell uname -s))
+	D2U_OS = linux
 endif
 endif
 
-ifndef OS
+ifndef D2U_OS
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
-	OS = cygwin
+	D2U_OS = cygwin
 endif
 endif
 
-ifeq (cygwin,$(OS))
+ifeq (cygwin,$(D2U_OS))
 ifdef ENABLE_NLS
 	LDFLAGS_EXTRA = -lintl -liconv -Wl,--enable-auto-import
 endif
@@ -140,9 +148,9 @@ endif
 	VERSIONSUFFIX	= -cygwin
 endif
 
-ifndef OS
+ifndef D2U_OS
 ifeq ($(findstring MSYS,$(shell uname)),MSYS)
-	OS = msys
+	D2U_OS = msys
 	EXE = .exe
 	VERSIONSUFFIX	= -msys
 	EO_XNOTATION=1
@@ -153,9 +161,9 @@ endif
 endif
 endif
 
-ifndef OS
+ifndef D2U_OS
 ifeq ($(findstring MINGW32,$(shell uname)),MINGW32)
-	OS = mingw32
+	D2U_OS = mingw32
 	prefix=c:/usr/local
 	EXE = .exe
 	VERSIONSUFFIX	= -win32
@@ -168,12 +176,12 @@ endif
 endif
 endif
 
-ifndef OS
+ifndef D2U_OS
 ifeq ($(shell uname),MS-DOS)
-	OS = msdos
-	prefix=c:/djgpp
+	D2U_OS = msdos
+	prefix=c:/dos32
 	EXE = .exe
-	VERSIONSUFFIX	= -dos32
+	VERSIONSUFFIX = pm
 	LINK_MAN = cp -f
 	docsubdir = dos2unix
 	EO_XNOTATION=1
@@ -185,9 +193,25 @@ endif
 endif
 endif
 
-ifndef OS
+ifndef D2U_OS
+ifeq ($(shell uname),OS/2)
+	D2U_OS = os/2
+	prefix=c:/usr
+	EXE = .exe
+	VERSIONSUFFIX = -os2
+	LINK_MAN = cp -f
+	EO_XNOTATION=1
+	UCS =
+	LDFLAGS_EXTRA = -Zargs-wild
+ifdef ENABLE_NLS
+	LDFLAGS_EXTRA += -lintl -liconv
+endif
+endif
+endif
+
+ifndef D2U_OS
 ifeq (FreeBSD, $(shell uname -s))
-	OS = freebsd
+	D2U_OS = freebsd
 ifdef ENABLE_NLS
 	CFLAGS_OS     = -I/usr/local/include
 	LDFLAGS_EXTRA = -lintl -L/usr/local/lib
@@ -196,7 +220,7 @@ endif
 endif
 
 ifeq (Darwin, $(shell uname -s))
-	OS = Darwin
+	D2U_OS = Darwin
 ifdef ENABLE_NLS
 	CFLAGS_OS     = -I/usr/local/include
 	LDFLAGS_EXTRA = -lintl -L/usr/local/lib
@@ -204,30 +228,30 @@ endif
 endif
 
 
-ifndef OS
+ifndef D2U_OS
 ifneq (, $(wildcard /opt/csw))
-	OS = sun
+	D2U_OS = sun
 endif
 endif
 
-ifeq (sun,$(OS))
+ifeq (sun,$(D2U_OS))
 	# Running under SunOS/Solaris
 	LDFLAGS_EXTRA = -lintl
 endif
 
-ifndef OS
+ifndef D2U_OS
 ifeq (HP-UX, $(shell uname -s))
-	OS = hpux
+	D2U_OS = hpux
 endif
 endif
 
-ifeq (hpux,$(OS))
+ifeq (hpux,$(D2U_OS))
 	# Running under HP-UX
 	EXTRA_DEFS += -Dhpux -D_HPUX_SOURCE
 endif
 
-ifndef OS
-	OS = unknown
+ifndef D2U_OS
+	D2U_OS = $(shell uname -s)
 endif
 
 # ............................................................ flags ...
@@ -274,6 +298,12 @@ DEFS		= $(EXTRA_DEFS) $(DEFS_USER)
 
 all: $(BIN) $(MAC2UNIX_BIN) $(UNIX2DOS_BIN) $(UNIX2MAC_BIN) $(DOCFILES) $(MOFILES) $(EOX_POFILES) $(MANFILES) man/man1/dos2unix.1
 
+status:
+	@echo "D2U_OS       = $(D2U_OS)"
+	@echo "UCS          = $(UCS)"
+	@echo "CFLAGS       = $(CFLAGS)"
+	@echo "EXTRA_CFLAGS = $(EXTRA_CFLAGS)"
+
 common.o : common.c common.h
 	$(CC) $(DEFS) $(EXTRA_CFLAGS) $(DOS2UNIX_NLSDEFS) $(CFLAGS) -c $< -o $@
 
@@ -303,13 +333,13 @@ $(UNIX2MAC_BIN) : $(UNIX2DOS_BIN)
 
 mofiles: $(MOFILES)
 
-html: $(PACKAGE).$(HTMLEXT) $(PACKAGE)-nl.$(HTMLEXT) $(PACKAGE)-es.$(HTMLEXT)
+html: $(HTMLFILES)
 
-txt: $(PACKAGE).txt
+txt: $(TXTFILES)
 
-ps: $(PACKAGE).ps
+ps: $(PSFILES)
 
-pdf: $(PACKAGE).pdf
+pdf: $(PDFFILES)
 
 doc: $(DOCFILES) $(MANFILES) man/man1/dos2unix.1
 
@@ -331,28 +361,45 @@ po/eo.mo : po/eo$(EO_NOTATION).po
 $(POT) : dos2unix.c unix2dos.c common.c
 	xgettext -C --keyword=_ $+ -o $(POT)
 
-%.txt : man/man1/%.pod
-	LC_CTYPE=C pod2text $< > $@
+# Convert text files to UTF-8. Notepad has no problem with UTF-8.
+# Use iconv to convert to UTF-8. There are many old pod2text versions
+# around that don't have the --utf8 option yet.
+%.tx1 : %.pod
+	pod2text $< > $@
+
+%.txt : %.tx1
+	iconv -f ISO-8859-1 -t UTF-8 $< > $@
 
-%.ps : man/man1/%.1
+# Create the English txt manual straight from the .pod file. It contains only ASCII.
+# This saves a dependency on iconv.
+man/man1/$(PACKAGE).txt : man/man1/$(PACKAGE).pod
+	pod2text $< > $@
+
+%.ps : %.1
 	groff -man $< -T ps > $@
 
 %.pdf: %.ps
 	ps2pdf $< $@
 
-%.$(HTMLEXT) : man/man1/%.pod
+# The POD files are encoded in Latin-1. See also man/man1/Makefile
+# For non-English HTML it is best to use UTF-8.
+%.ut8 : %.pod
+	iconv -f ISO-8859-1 -t UTF-8 $< > $@
+
+# Generic rule.
+%.$(HTMLEXT) : %.ut8
 	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
 
-# The POD files are encoded in Latin-1. See also man/man1/Makefile
-# For HTML it is best to use UTF-8.
+# Create the English html manual straight from the .pod file. It contains only ASCII.
+# This saves a dependency on iconv.
+man/man1/$(PACKAGE).$(HTMLEXT) : man/man1/$(PACKAGE).pod
+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
 
-%-nl.$(HTMLEXT) : man/nl/man1/%.pod
-	iconv -f ISO-8859-1 -t UTF-8 $< > $(patsubst %.pod,%.ut8,$<)
-	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter" $(patsubst %.pod,%.ut8,$<) > $@
+man/nl/man1/$(PACKAGE).$(HTMLEXT) : man/nl/man1/$(PACKAGE).ut8
+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter" $< > $@
 
-%-es.$(HTMLEXT) : man/es/man1/%.pod
-	iconv -f ISO-8859-1 -t UTF-8 $< > $(patsubst %.pod,%.ut8,$<)
-	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa" $(patsubst %.pod,%.ut8,$<) > $@
+man/es/man1/$(PACKAGE).$(HTMLEXT) : man/es/man1/$(PACKAGE).ut8
+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa" $< > $@
 
 install: all
 	$(MKDIR) -p -m 755 $(DESTDIR)$(bindir)
@@ -386,9 +433,26 @@ ifdef ENABLE_NLS
 	$(foreach mofile, $(MOFILES), $(MKDIR) -p -m 755 $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES ;)
 	$(foreach mofile, $(MOFILES), $(INSTALL) -m 644 $(mofile) $(DESTDIR)$(localedir)/$(basename $(notdir $(mofile)))/LC_MESSAGES/$(PACKAGE).mo ;)
 endif
+	# Run a new instance of 'make' otherwise the $$(wildcard ) function my not have been expanded,
+	# because the files may not have been there when make was started.
+	$(MAKE) install-doc
+
+
+install-doc: $(INSTALL_OBJS_DOC)
 	@echo "-- install-doc"
 	$(MKDIR) -p -m 755 $(DESTDIR)$(docdir)
-	$(INSTALL) -m 644 $(INSTALL_OBJS_DOC) $(wildcard $(PACKAGE).ps) $(wildcard $(PACKAGE).pdf) $(DESTDIR)$(docdir)
+	$(INSTALL) -m 644 $(INSTALL_OBJS_DOC) $(DESTDIR)$(docdir)
+	# Install translated manuals when they have been generated.
+	$(foreach txtfile, $(wildcard man/*/man1/*.txt), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;)
+	$(foreach txtfile, $(wildcard man/*/man1/*.txt), $(INSTALL) -m 644 $(txtfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(txtfile),)) ;)
+	$(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;)
+	$(foreach htmlfile, $(wildcard man/*/man1/*.$(HTMLEXT)), $(INSTALL) -m 644 $(htmlfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(htmlfile),)) ;)
+	$(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;)
+	$(foreach pdffile, $(wildcard man/*/man1/*.pdf), $(INSTALL) -m 644 $(pdffile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(pdffile),)) ;)
+	$(foreach pdffile, $(wildcard man/man1/*.pdf), $(INSTALL) -m 644 $(pdffile) $(DESTDIR)$(docdir) ;)
+	$(foreach psfile, $(wildcard man/*/man1/*.ps), $(MKDIR) -p -m 755 $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;)
+	$(foreach psfile, $(wildcard man/*/man1/*.ps), $(INSTALL) -m 644 $(psfile) $(DESTDIR)$(docdir)/$(word 2,$(subst /, ,$(psfile),)) ;)
+	$(foreach psfile, $(wildcard man/man1/*.ps), $(INSTALL) -m 644 $(psfile) $(DESTDIR)$(docdir) ;)
 
 uninstall:
 	@echo "-- target: uninstall"
@@ -412,19 +476,29 @@ mostlyclean:
 	rm -f *.bak *~
 	rm -f *.tmp
 	rm -f man/man1/*.bak man/man1/*~
-	rm -f man/*/man1/*.bak man/*/man1/*~ man/*/man1/*.ut8
+	rm -f man/*/man1/*.bak man/*/man1/*~
 	rm -f po/*.bak po/*~
 	rm -f po/*.mo
 
 clean: mostlyclean
-	rm -f $(DOCFILES) $(PACKAGE).ps $(PACKAGE).pdf
 	rm -f man/man1/*.1
+	rm -f man/man1/*.txt
+	rm -f man/man1/*.$(HTMLEXT)
+	rm -f man/man1/*.ps
+	rm -f man/man1/*.pdf
+	rm -f man/man1/*.ut8
 	rm -f man/*/man1/*.1
-	rm -f *.$(HTMLEXT)
+	rm -f man/*/man1/*.txt
+	rm -f man/*/man1/*.$(HTMLEXT)
+	rm -f man/*/man1/*.ps
+	rm -f man/*/man1/*.pdf
+	rm -f man/*/man1/*.ut8
 
 distclean: clean
 
 maintainer-clean: distclean
+	@echo 'This command is intended for maintainers to use; it'
+	@echo 'deletes files that may need special tools to rebuild.'
 
 realclean: maintainer-clean
 
@@ -454,21 +528,24 @@ TBZFILE = $(PACKAGE)-$(DOS2UNIX_VERSION)$(VERSIONSUFFIX)$(NLSSUFFIX).tar.bz2
 
 dist-zip:
 	rm -f $(prefix)/$(ZIPFILE)
-	cd $(prefix) ; unix2dos share/doc/$(docsubdir)/*.txt share/man/man1/$(PACKAGE).1 share/man/man1/$(MAC2UNIX).1 share/man/man1/$(UNIX2DOS).1 share/man/man1/$(UNIX2MAC).1
-	cd $(prefix) ; unix2dos share/doc/$(docsubdir)/*.$(HTMLEXT)
+	cd $(prefix) ; unix2dos share/man/man1/*.1 share/man/*/man1/*.1
+	-cd $(prefix) ; unix2dos share/doc/$(docsubdir)/*.txt share/doc/$(docsubdir)/*/*.txt
+	-cd $(prefix) ; unix2dos share/doc/$(docsubdir)/*.$(HTMLEXT) share/doc/$(docsubdir)/*/*.$(HTMLEXT)
 	cd $(prefix) ; unix2dos share/man/*/man1/$(PACKAGE).1 share/man/*/man1/$(MAC2UNIX).1 share/man/*/man1/$(UNIX2DOS).1 share/man/*/man1/$(UNIX2MAC).1
 	cd $(prefix) ; zip -r $(ZIPFILE) $(ZIPOBJ)
 	mv -f $(prefix)/$(ZIPFILE) ..
 
 dist-tgz:
-	cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.txt share/man/man1/$(PACKAGE).1 share/man/man1/$(MAC2UNIX).1 share/man/man1/$(UNIX2DOS).1 share/man/man1/$(UNIX2MAC).1
-	cd $(prefix) ; dos2unix share/man/*/man1/$(PACKAGE).1 share/man/*/man1/$(MAC2UNIX).1 share/man/*/man1/$(UNIX2DOS).1 share/man/*/man1/$(UNIX2MAC).1
+	cd $(prefix) ; dos2unix share/man/man1/*.1 share/man/*/man1/*.1
+	-cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.txt share/doc/$(docsubdir)/*/*.txt
+	-cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.$(HTMLEXT) share/doc/$(docsubdir)/*/*.$(HTMLEXT)
 	cd $(prefix) ; tar cvzf $(TGZFILE) $(ZIPOBJ)
 	mv $(prefix)/$(TGZFILE) ..
 
 dist-tbz:
-	cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.txt share/man/man1/$(PACKAGE).1 share/man/man1/$(MAC2UNIX).1 share/man/man1/$(UNIX2DOS).1 share/man/man1/$(UNIX2MAC).1
-	cd $(prefix) ; dos2unix share/man/*/man1/$(PACKAGE).1 share/man/*/man1/$(MAC2UNIX).1 share/man/*/man1/$(UNIX2DOS).1 share/man/*/man1/$(UNIX2MAC).1
+	cd $(prefix) ; dos2unix share/man/man1/*.1 share/man/*/man1/*.1
+	-cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.txt dos2unix share/doc/$(docsubdir)/*/*.txt
+	-cd $(prefix) ; dos2unix share/doc/$(docsubdir)/*.$(HTMLEXT) dos2unix share/doc/$(docsubdir)/*/*.$(HTMLEXT)
 	cd $(prefix) ; tar cvjf $(TBZFILE) $(ZIPOBJ)
 	mv $(prefix)/$(TBZFILE) ..
 
diff --git a/NEWS.txt b/NEWS.txt
index dd6df2f..e59f310 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,9 @@
+2012-09-06: Version 6.0.2
+
+  * The locale encoding detection has been fixed when NLS was disabled.
+  * Print line number when a binary symbol is found.
+  * Updated makefiles for Watcom C, and added a new one for OS/2.
+
 2012-07-25: Version 6.0.1
 
   * Update Spanish translations.
@@ -49,7 +55,7 @@
 
   * ISO conversion mode supports same DOS code pages as SunOS dos2unix does:
       CP437 (US), CP850 (Western European), CP860 (Portuguese),
-      CP863 (French Canadian), and CP865 (Nordic). 
+      CP863 (French Canadian), and CP865 (Nordic).
   * ISO conversion mode supports Windows code page CP1252 (Western).
   * SunOS compatible options -ascii, -iso, -7, -437, -850, -860, -863, and -865.
   * Active code page detection for ISO mode.
diff --git a/README.txt b/README.txt
index 207c845..3e24b23 100644
--- a/README.txt
+++ b/README.txt
@@ -24,7 +24,7 @@ HISTORY
         part of several Linux distributions such as RedHat, Fedora, Suse and
         others.  This update includes all RedHat patches and fixes several
         other problems.  Internationalization has been added and ports to DOS,
-        Windows, Cygwin and OS/2 Warp have been made. 
+        Windows, Cygwin and OS/2 Warp have been made.
 
         These implementations of dos2unix and unix2dos have been modelled after
         dos2unix/unix2dos under SunOS/Solaris.  They have similar conversion
@@ -46,7 +46,7 @@ HISTORY
 
 AUTHORS
 
-        Erwin Waterlander       version 3.2-6.0.1  2009-2012 
+        Erwin Waterlander       version 3.2-6.0.2  2009-2012
         Christian Wurll         version 3.1        1998
         Bernd Johannes Wuebben  version 3.0        1998
         Benjamin Lin            version 1.1-2.3    1994-1995
@@ -79,15 +79,17 @@ ACKNOWLEDGEMENTS
         Steven H. Levine      Support wildcard expansion on OS/2.
         Steve Hay             Support wildcard expansion on win64.
         Michael Schindler     Fixed compiler warning.
+	Somsak Pattanaprateep Print line number when binary symbol is found.
 
 FINDUTILS
 
-        Windows users who are looking for the Unix 'find' and 'xargs' commands can
-        find them in the findutils package for Windows at the ezwinports project
-        page at: http://sourceforge.net/projects/ezwinports/files/
+        Windows users who are looking for the Unix 'find' and 'xargs' commands
+        can find them in the findutils package for Windows at the ezwinports
+        project page at: http://sourceforge.net/projects/ezwinports/files/
 
-        A DOS version of the findutils package can be obtained from the DJGPP project
-        (http://www.delorie.com/djgpp/) at ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/
+        A DOS version of the findutils package can be obtained from the DJGPP
+        project (http://www.delorie.com/djgpp/) at
+        ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/
 
 CONTACT INFORMATION
 
diff --git a/bcc.mak b/bcc.mak
index 25cbdbe..1ba1b6e 100644
--- a/bcc.mak
+++ b/bcc.mak
@@ -1,7 +1,7 @@
 !include version.mk
 
 CC      = bcc
-DEFINES = -DMSDOS -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)"
+DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)"
 CFLAGS  = $(DEFINES) -Z -O -w -mc -1
 WILDARGS = c:/bc4/lib/16bit/wildargs.obj
 
diff --git a/common.c b/common.c
index cc111fd..08f4098 100644
--- a/common.c
+++ b/common.c
@@ -1,7 +1,7 @@
 /*
  *   Copyright (C) 2009-2012 Erwin Waterlander
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
@@ -10,7 +10,7 @@
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice in the documentation and/or other materials provided with
  *      the distribution.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
  *   EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -26,7 +26,7 @@
 
 #include "common.h"
 #if defined(D2U_UNICODE)
-#if defined(WIN32) || defined(__CYGWIN__)
+#if defined(__WIN32__) || defined(__CYGWIN__)
 #include <windows.h>
 #endif
 #endif
@@ -239,24 +239,26 @@ void PrintVersion(char *progname)
 #endif
 #if defined(__WATCOMC__) && defined(__I86__)
   fprintf(stderr, "%s", _("DOS 16 bit version (WATCOMC).\n"));
-#elif defined(__TURBOC__)
+#elif defined(__TURBOC__) && defined(__MSDOS__)
   fprintf(stderr, "%s", _("DOS 16 bit version (TURBOC).\n"));
 #elif defined(__WATCOMC__) && defined(__DOS__)
   fprintf(stderr, "%s", _("DOS 32 bit version (WATCOMC).\n"));
-#elif defined(DJGPP)
+#elif defined(__DJGPP__)
   fprintf(stderr, "%s", _("DOS 32 bit version (DJGPP).\n"));
 #elif defined(__MSYS__)
   fprintf(stderr, "%s", _("MSYS version.\n"));
 #elif defined(__CYGWIN__)
   fprintf(stderr, "%s", _("Cygwin version.\n"));
-#elif defined(__WIN64__)
+#elif defined(__WIN64__) && defined(__MINGW64__)
   fprintf(stderr, "%s", _("Windows 64 bit version (MinGW-w64).\n"));
 #elif defined(__WATCOMC__) && defined(__NT__)
   fprintf(stderr, "%s", _("Windows 32 bit version (WATCOMC).\n"));
-#elif defined(__WIN32__)
+#elif defined(__WIN32__) && defined(__MINGW32__)
   fprintf(stderr, "%s", _("Windows 32 bit version (MinGW).\n"));
-#elif defined (__OS2__) /* OS/2 Warp */
-  fprintf(stderr, "%s", _("OS/2 version.\n"));
+#elif defined (__OS2__) && defined(__WATCOMC__) /* OS/2 Warp */
+  fprintf(stderr, "%s", _("OS/2 version (WATCOMC).\n"));
+#elif defined (__OS2__) && defined(__EMX__) /* OS/2 Warp */
+  fprintf(stderr, "%s", _("OS/2 version (EMX).\n"));
 #endif
 #ifdef D2U_UNICODE
   fprintf(stderr, "%s", _("With Unicode UTF-16 support.\n"));
@@ -327,14 +329,14 @@ int MakeTempFileFrom(const char *OutFN, char **fname_ret)
 #else
   int fd = -1;
 #endif
-  
+
   *fname_ret = NULL;
 
   if (!cpy)
     goto make_failed;
-  
+
   dir = dirname(cpy);
-  
+
   fname_len = strlen(dir) + strlen("/d2utmpXXXXXX") + sizeof (char);
   if (!(fname_str = malloc(fname_len)))
     goto make_failed;
@@ -352,9 +354,9 @@ int MakeTempFileFrom(const char *OutFN, char **fname_ret)
   if ((fd = mkstemp(fname_str)) == -1)
     goto make_failed;
 #endif
-  
+
   return (fd);
-  
+
  make_failed:
   free(*fname_ret);
   *fname_ret = NULL;
@@ -587,46 +589,53 @@ wint_t d2u_putwc(wint_t wc, FILE *f, CFlag *ipFlag)
    {
       /* fprintf(stderr, "UTF-16 trail %x\n",wc); */
       trail = (wchar_t)wc; /* trail (low) surrogate */
-#if defined(WIN32) || defined(__CYGWIN__)
+#if defined(__WIN32__) || defined(__CYGWIN__)
       /* On Windows (including Cygwin) wchar_t is 16 bit */
       /* We cannot decode an UTF-16 surrogate pair, because it will
          not fit in a 16 bit wchar_t. */
       wstr[0] = lead;
       wstr[1] = trail;
       wstr[2] = L'\0';
-#else      
+#else
       /* On Unix wchar_t is 32 bit */
       /* When we don't decode the UTF-16 surrogate pair, wcstombs() does not
        * produce the same UTF-8 as WideCharToMultiByte().  The UTF-8 output
        * produced by wcstombs() is bigger, because it just translates the wide
        * characters in the range 0xD800..0xDBFF individually to UTF-8 sequences
        * (although these code points are reserved for use only as surrogate
-       * pairs in UTF-16). Probably because on Unix the size of wide char
-       * (wchar_t) is 32 bit, wcstombs assumes the encoding is UTF-32, and
-       * ignores UTF-16 surrogates all together.  Some smart viewers can still
-       * display this UTF-8 correctly (like Total Commander lister), however
-       * the UTF-8 is not readable by Windows Notepad (on Windows 7).  When we
-       * decode the UTF-16 surrogate pairs ourselves the wcstombs() UTF-8
-       * output is identical to what WideCharToMultiByte() produces, and is
-       * readable by Notepad.
-       */ 
+       * pairs in UTF-16).
+       *
+       * Some smart viewers can still display this UTF-8 correctly (like Total
+       * Commander lister), however the UTF-8 is not readable by Windows
+       * Notepad (on Windows 7).  When we decode the UTF-16 surrogate pairs
+       * ourselves the wcstombs() UTF-8 output is identical to what
+       * WideCharToMultiByte() produces, and is readable by Notepad.
+       *
+       * Surrogate halves in UTF-8 are invalid. See also
+       * http://en.wikipedia.org/wiki/UTF-8#Invalid_code_points
+       * http://tools.ietf.org/html/rfc3629#page-5
+       * It is a bug in (some implemenatations of) wcstombs().
+       * On Cygwin 1.7 wcstombs() produces correct UTF-8 from UTF-16 surrogate pairs.
+       */
       /* Decode UTF-16 surrogate pair */
       wstr[0] = 0x10000;
       wstr[0] += (lead & 0x03FF) << 10;
       wstr[0] += (trail & 0x03FF);
       wstr[1] = L'\0';
+      /* fprintf(stderr, "UTF-32  %x\n",wstr[0]); */
 #endif
    } else {
       wstr[0] = (wchar_t)wc;
       wstr[1] = L'\0';
    }
 
-#if defined(WIN32) || defined(__CYGWIN__)
+#if defined(__WIN32__) || defined(__CYGWIN__)
    /* On Windows we convert UTF-16 always to UTF-8 */
    len = (size_t)(WideCharToMultiByte(CP_UTF8, 0, wstr, -1, mbs, sizeof(mbs), NULL, NULL) -1);
 #else
    /* On Unix we convert UTF-16 to the locale encoding */
    len = wcstombs(mbs, wstr, sizeof(mbs));
+   /* fprintf(stderr, "len  %d\n",len); */
 #endif
 
    if ( len == (size_t)(-1) )
diff --git a/common.h b/common.h
index fe74754..2c60671 100644
--- a/common.h
+++ b/common.h
@@ -1,7 +1,7 @@
 /*
  *   Copyright (C) 2009-2012 Erwin Waterlander
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
@@ -10,7 +10,7 @@
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice in the documentation and/or other materials provided with
  *      the distribution.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
  *   EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -52,7 +52,7 @@
 
 #endif
 
-#if defined(DJGPP) || defined(__TURBOC__) /* DJGPP */
+#if defined(__DJGPP__) || defined(__TURBOC__) /* DJGPP */
 #  include <dir.h>
 #else
 #  ifndef __MSYS__
@@ -77,38 +77,36 @@
 #define __FLAT__
 #endif
 #include <sys/stat.h>
-#ifdef ENABLE_NLS
-#include <locale.h>
-#endif
 #include <errno.h>
 #ifdef D2U_UNICODE
 #include <wchar.h>
 #endif
 
 #if (defined(__WATCOMC__) && defined(__NT__))  /* Watcom */
-#  define WIN32 1
+#  define __WIN32__ 1
 #endif
 
 #if defined(__WATCOMC__) && defined(__I86__) /* Watcom C, 16 bit Intel */
-#define MSDOS 1
+#define __MSDOS__ 1
 #endif
 
 #if defined(__WATCOMC__) && defined(__DOS__) /* Watcom C, 32 bit DOS */
-#define MSDOS 1
+#define __MSDOS__ 1
 #endif
 
-#if defined(WIN32) && !defined(__CYGWIN__) /* Windows */
-#define MSDOS 1
+#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__))
+/* setlocale() is also needed for nl_langinfo() */
+#include <locale.h>
 #endif
 
-#if  defined(__TURBOC__) || defined(DJGPP) || defined(__MINGW32__)
+#if  defined(__TURBOC__) || defined(__DJGPP__) || defined(__MINGW32__)
 /* Some compilers have no mkstemp().
  * Use mktemp() instead.
  * BORLANDC, DJGPP, MINGW32 */
 #define NO_MKSTEMP 1
 #endif
 
-#if  defined(__TURBOC__) || defined(DJGPP) || defined(__MINGW32__) || defined(__WATCOMC__)
+#if  defined(__TURBOC__) || defined(__DJGPP__) || defined(__MINGW32__) || defined(__WATCOMC__)
 /* Some compilers have no chown(). */
 #define NO_CHOWN 1
 #endif
@@ -118,25 +116,25 @@
 #undef S_ISLNK
 #endif
 
-#if defined(MSDOS) || defined(__OS2__)
+#if defined(__MSDOS__) || defined(__WIN32__) || defined(__OS2__)
 /* Systems without soft links use 'stat' instead of 'lstat'. */
 #define STAT stat
 #else
 #define STAT lstat
 #endif
 
-#if defined(MSDOS) || defined(__OS2__)
+#if defined(__MSDOS__) || defined(__WIN32__) || defined(__OS2__)
 /* On some systems rename() will always fail if target file already exists. */
 #define NEED_REMOVE 1
 #endif
 
-#if defined(MSDOS) || defined(__CYGWIN__) || defined(__OS2__) /* DJGPP, MINGW32 and OS/2 */
+#if defined(__MSDOS__) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__OS2__) /* DJGPP, MINGW32 and OS/2 */
 /* required for setmode() and O_BINARY */
 #include <fcntl.h>
 #include <io.h>
 #endif
 
-#if defined(MSDOS) || defined(__CYGWIN__) || defined(__OS2__)
+#if defined(__MSDOS__) || defined(__WIN32__) || defined(__CYGWIN__) || defined(__OS2__)
   #define R_CNTRL   "rb"
   #define W_CNTRL   "wb"
 #else
@@ -182,8 +180,8 @@ typedef struct
   int NewFile;                          /* is in new file mode? */
   int Quiet;                            /* is in quiet mode? */
   int KeepDate;                         /* should keep date stamp? */
-  int ConvMode;                         /* 0: ascii, 1: 7bit, 2: iso */  
-  int FromToMode;                       /* 0: dos2unix/unix2dos, 1: mac2unix/unix2mac */  
+  int ConvMode;                         /* 0: ascii, 1: 7bit, 2: iso */
+  int FromToMode;                       /* 0: dos2unix/unix2dos, 1: mac2unix/unix2mac */
   int NewLine;                          /* if TRUE, then additional newline */
   int Force;                            /* if TRUE, force conversion of all files. */
   int Follow;                           /* 0: skip symlink, 1: follow symbolic link, 2: replace symlink. */
diff --git a/djgpp.mak b/djgpp.mak
index 25c0954..40a9e1c 100644
--- a/djgpp.mak
+++ b/djgpp.mak
@@ -3,24 +3,30 @@
 # Copyright (C) 2009-2012 Erwin Waterlander
 # This file is distributed under the same license as the dos2unix package.
 
-prefix=c:/djgpp
+include version.mk
+
+prefix=c:/dos32
 #ENABLE_NLS=1
 ENABLE_NLS=
 VERSIONSUFFIX=-dos32
 
 ifdef ENABLE_NLS
 LDFLAGS_EXTRA = -lintl -liconv
+NLS_SUFFIX = -nls
 endif
+VERSIONSUFFIX = pm
+ZIPFILE = d2u$(DOS2UNIX_VERSION_SHORT)$(VERSIONSUFFIX)$(NLS_SUFFIX).zip
 ZIPOBJ_EXTRA = bin/cwsdpmi.exe
+docsubdir = dos2unix
 
 all:
-	$(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=dos2unix EO_XNOTATION=1 UCS=
+	$(MAKE) all EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) EO_XNOTATION=1 UCS=
 
 install:
-	$(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=dos2unix EO_XNOTATION=1 UCS=
+	$(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK_MAN="cp -f" docsubdir=$(docsubdir) EO_XNOTATION=1 UCS=
 
 uninstall:
-	$(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=dos2unix
+	$(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=$(docsubdir)
 
 clean:
 	$(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
@@ -29,7 +35,7 @@ mostlyclean:
 	$(MAKE) mostlyclean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
 
 dist:
-	$(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="$(VERSIONSUFFIX)" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS) docsubdir=dos2unix
+	$(MAKE) dist-zip EXE=.exe prefix=$(prefix) VERSIONSUFFIX="$(VERSIONSUFFIX)" ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS) ZIPFILE=${ZIPFILE} docsubdir=$(docsubdir)
 
 strip:
 	$(MAKE) strip LINK_MAN="cp -f" EXE=.exe
diff --git a/dos16_gnu.mak b/dos16_gnu.mak
deleted file mode 100644
index 4c53b29..0000000
--- a/dos16_gnu.mak
+++ /dev/null
@@ -1,32 +0,0 @@
-
-# Author: Erwin Waterlander
-# Copyright (C) 2009-2011 Erwin Waterlander
-# This file is distributed under the same license as the dos2unix package.
-
-include version.mk
-
-prefix=c:/dos16
-ENABLE_NLS=
-
-ifdef ENABLE_NLS
-LDFLAGS_EXTRA = -lintl -liconv
-endif
-
-all:
-	wmake -f wccdos16.mak
-
-install:
-	$(MAKE) install EXE=.exe ENABLE_NLS=$(ENABLE_NLS) LDFLAGS_EXTRA="$(LDFLAGS_EXTRA)" prefix=$(prefix) LINK="cp -f" docsubdir=dos2unix
-
-uninstall:
-	$(MAKE) uninstall EXE=.exe prefix=$(prefix) docsubdir=dos2unix
-
-clean:
-	$(MAKE) clean EXE=.exe ENABLE_NLS=$(ENABLE_NLS) prefix=$(prefix)
-
-dist:
-	$(MAKE) dist-zip EXE=.exe prefix=$(prefix) ZIPOBJ_EXTRA="${ZIPOBJ_EXTRA}" ENABLE_NLS=$(ENABLE_NLS) docsubdir=dos2unix ZIPFILE=d2u$(DOS2UNIX_VERSION_SHORT)b.zip
-
-strip:
-	wmake -f wccdos16.mak strip
-
diff --git a/dos2unix.c b/dos2unix.c
index 88d3354..01f217c 100644
--- a/dos2unix.c
+++ b/dos2unix.c
@@ -6,7 +6,7 @@
  *  The dos2unix package is distributed under FreeBSD style license.
  *  See also http://www.freebsd.org/copyright/freebsd-license.html
  *  --------
- * 
+ *
  *  Copyright (C) 2009-2012 Erwin Waterlander
  *  Copyright (C) 1998 Christian Wurll
  *  Copyright (C) 1998 Bernd Johannes Wuebben
@@ -49,12 +49,12 @@
  *
  * Added Mac text file translation, i.e. \r to \n conversion
  * Bernd Johannes Wuebben, wuebben@kde.org
- * Wed Feb  4 19:12:58 EST 1998      
+ * Wed Feb  4 19:12:58 EST 1998
  *
  * Added extra newline if ^M occurs
  * Christian Wurll, wurll@ira.uka.de
- * Thu Nov 19 1998 
- * 
+ * Thu Nov 19 1998
+ *
  *  See ChangeLog.txt for complete version history.
  *
  */
@@ -66,7 +66,7 @@
 #include "dos2unix.h"
 #include "querycp.h"
 #ifdef D2U_UNICODE
-#ifndef MSDOS  /* Unix, Cygwin */
+#if !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__)  /* Unix, Cygwin */
 # include <langinfo.h>
 #endif
 #endif
@@ -134,6 +134,7 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
     int RetVal = 0;
     wint_t TempChar;
     wint_t TempNextChar;
+    int line_nr = 1;
 
     ipFlag->status = 0;
 
@@ -156,9 +157,16 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               (TempChar != 0x0c)) {  /* Not a form feed */
             RetVal = -1;
             ipFlag->status |= BINARY_FILE ;
+            if (!ipFlag->Quiet)
+            {
+              fprintf(stderr, "%s: ", progname);
+              fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+            }
             break;
           }
           if (TempChar != 0x0d) {
+            if (TempChar == 0x0a) /* Count all DOS and Unix line breaks */
+              ++line_nr;
             if (d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF) {
               RetVal = -1;
               if (!ipFlag->Quiet)
@@ -170,7 +178,7 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 }
               }
               break;
-            } 
+            }
           } else {
             StripDelimiterW( ipInF, ipOutF, ipFlag, TempChar );
           }
@@ -186,10 +194,17 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               (TempChar != 0x0c)) {  /* Not a form feed */
             RetVal = -1;
             ipFlag->status |= BINARY_FILE ;
+            if (!ipFlag->Quiet)
+            {
+              fprintf(stderr, "%s: ", progname);
+              fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+            }
             break;
           }
           if ((TempChar != 0x0d))
             {
+              if (TempChar == 0x0a) /* Count all DOS and Unix line breaks */
+                ++line_nr;
               if(d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF){
                 RetVal = -1;
                 if (!ipFlag->Quiet)
@@ -226,6 +241,7 @@ int ConvertDosToUnixW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 }
                 break;
               }
+            line_nr++; /* Count all Mac line breaks */
             if (ipFlag->NewLine) {  /* add additional LF? */
               d2u_putwc(0x0a, ipOutF, ipFlag);
             }
@@ -254,6 +270,7 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
     int TempChar;
     int TempNextChar;
     int *ConvTable;
+    int line_nr = 1;
 
     ipFlag->status = 0;
 
@@ -312,9 +329,16 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               (TempChar != '\x0c')) {  /* Not a form feed */
             RetVal = -1;
             ipFlag->status |= BINARY_FILE ;
+            if (!ipFlag->Quiet)
+            {
+              fprintf(stderr, "%s: ", progname);
+              fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+            }
             break;
           }
           if (TempChar != '\x0d') {
+            if (TempChar == '\x0a') /* Count all DOS and Unix line breaks */
+              ++line_nr;
             if (fputc(ConvTable[TempChar], ipOutF) == EOF) {
               RetVal = -1;
               if (!ipFlag->Quiet)
@@ -323,7 +347,7 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 fprintf(stderr, "%s", _("can not write to output file\n"));
               }
               break;
-            } 
+            }
           } else {
             StripDelimiter( ipInF, ipOutF, ipFlag, TempChar );
           }
@@ -339,10 +363,17 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               (TempChar != '\x0c')) {  /* Not a form feed */
             RetVal = -1;
             ipFlag->status |= BINARY_FILE ;
+            if (!ipFlag->Quiet)
+            {
+              fprintf(stderr, "%s: ", progname);
+              fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+            }
             break;
           }
           if ((TempChar != '\x0d'))
             {
+              if (TempChar == '\x0a') /* Count all DOS and Unix line breaks */
+                ++line_nr;
               if(fputc(ConvTable[TempChar], ipOutF) == EOF){
                 RetVal = -1;
                 if (!ipFlag->Quiet)
@@ -373,6 +404,7 @@ int ConvertDosToUnix(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                 }
                 break;
               }
+            line_nr++; /* Count all Mac line breaks */
             if (ipFlag->NewLine) {  /* add additional LF? */
               fputc('\x0a', ipOutF);
             }
@@ -460,7 +492,7 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     }
     RetVal = -1;
   }
-  
+
 #ifdef NO_MKSTEMP
   if((fd = MakeTempFileFrom(ipOutFN, &TempPath))==NULL) {
 #else
@@ -516,7 +548,7 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
   InF = read_bom(InF, &ipFlag->bomtype);
 
 #ifdef D2U_UNICODE
-#ifndef MSDOS  /* Unix, Cygwin */
+#if !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__)  /* Unix, Cygwin */
   if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))
   {
     if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
@@ -529,7 +561,7 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     }
   }
 #endif
-#if !defined(WIN32) && !defined(__CYGWIN__) /* Not Windows or Cygwin */
+#if !defined(__WIN32__) && !defined(__CYGWIN__) /* Not Windows or Cygwin */
   if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))
   {
     if (sizeof(wchar_t) < 4)
@@ -592,14 +624,14 @@ int ConvertDosToUnixNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     if (ipFlag->NewFile == 0) /* old file mode */
     {
        RetVal = chmod (TempPath, StatBuf.st_mode); /* set original permissions */
-    } 
+    }
     else
     {
        mask = umask(0); /* get process's umask */
        umask(mask); /* set umask back to original */
        RetVal = chmod(TempPath, StatBuf.st_mode & ~mask); /* set original permissions, minus umask */
     }
-    
+
     if (RetVal)
     {
        if (!ipFlag->Quiet)
@@ -737,7 +769,7 @@ int ConvertDosToUnixStdio(CFlag *ipFlag, char *progname)
     ipFlag->KeepDate = 0;
     ipFlag->Force = 1;
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(__WIN32__) && !defined(__CYGWIN__)
 
     /* stdin and stdout are by default text streams. We need
      * to set them to binary mode. Otherwise an LF will
@@ -749,7 +781,7 @@ int ConvertDosToUnixStdio(CFlag *ipFlag, char *progname)
 
     _setmode(fileno(stdout), O_BINARY);
     _setmode(fileno(stdin), O_BINARY);
-#elif defined(MSDOS) || defined(__CYGWIN__) || defined(__OS2__)
+#elif defined(__MSDOS__) || defined(__CYGWIN__) || defined(__OS2__)
     setmode(fileno(stdout), O_BINARY);
     setmode(fileno(stdin), O_BINARY);
 #endif
@@ -808,8 +840,14 @@ int main (int argc, char *argv[])
          strcpy(localedir,LOCALEDIR);
       }
    }
+#endif
 
+#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__))
+/* setlocale() is also needed for nl_langinfo() */
    setlocale (LC_ALL, "");
+#endif
+
+#ifdef ENABLE_NLS
    bindtextdomain (PACKAGE, localedir);
    textdomain (PACKAGE);
 #endif
@@ -819,7 +857,7 @@ int main (int argc, char *argv[])
   ArgIdx = 0;
   CanSwitchFileMode = 1;
   ShouldExit = 0;
-  pFlag = (CFlag*)malloc(sizeof(CFlag));  
+  pFlag = (CFlag*)malloc(sizeof(CFlag));
   pFlag->NewFile = 0;
   pFlag->Quiet = 0;
   pFlag->KeepDate = 0;
diff --git a/os2.mak b/emx.mak
index 99fa4a0..99fa4a0 100644
--- a/os2.mak
+++ b/emx.mak
diff --git a/man/es/man1/dos2unix.pod b/man/es/man1/dos2unix.pod
index cace044..8579e01 100755
--- a/man/es/man1/dos2unix.pod
+++ b/man/es/man1/dos2unix.pod
@@ -6,7 +6,7 @@
 #
 #   Copyright (C) 2009-2012 Erwin Waterlander
 #   All rights reserved.
-# 
+#
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #   are met:
@@ -15,7 +15,7 @@
 #   2. Redistributions in binary form must reproduce the above copyright
 #      notice in the documentation and/or other materials provided with
 #      the distribution.
-# 
+#
 #   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
 #   EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 #   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/man/man1/Makefile b/man/man1/Makefile
index a44e633..4f81af8 100644
--- a/man/man1/Makefile
+++ b/man/man1/Makefile
@@ -70,20 +70,26 @@ MAN_OBJECTS = dos2unix.1 $(patsubst %.pod,%.1,$(PODFILES))
 
 all: $(MAN_OBJECTS)
 
-# For now the .pod files are still encoded in Latin-1, because the perl version of
-# MinGW and DJGPP is 5.8.8. The pod2man command of perl 5.8.8 does not yet support UTF-8
-# and does not have the options -u, --utf8.
-# Another issue is poor UTF-8 support in Windows Command Prompt.
+
+# The .pod files are encoded in Latin-1.  UTF-8 man pages are not properly
+# displayed in a Windows Command Prompt, therefore we keep them in Latin-1
+# (CP1252) format.
+
+# Cygwin 1.7 expects man pages to be in Latin-1 format.
+
+# The perl version of MinGW and DJGPP is 5.8.8. The pod2man command of perl
+# 5.8.8 does not yet have the options -u, --utf8.
 
 # There are different *roff implementations. For now I assume we are using
-# groff (GNU-roff) which is wide spread, default on Linux, Cygwin, MinGW,
-# and DJGPP.
-# The groff specific escape sequences may not work with other *roff implementations,
-# but they display OK when used in a Windows Command Prompt using DJGPP's or MinGW's
-# groff. Although sometimes characters are displayed without their diacritics.
+# groff (GNU-roff) which is wide spread, default on Linux, Cygwin, MinGW, and
+# DJGPP.  The groff specific escape sequences may not work with other *roff
+# implementations, but they display OK when used in a Windows Command Prompt
+# using DJGPP's or MinGW's groff. Although sometimes characters are displayed
+# without their diacritics.
 
 # One day everything will be in UTF-8...
-# For the English manual it all makes no difference, because the English text is plain ASCII.
+# For the English manual it all makes no difference, because the English text
+# is plain ASCII.
 
 %.1 : %.pod
 	# make target - create manual page from a *.pod page
@@ -96,7 +102,7 @@ all: $(MAN_OBJECTS)
 	| sed 's,[Pp]erl v[0-9.]\+,$(PACKAGE),' \
 	  > $@ && \
 	rm -f pod*.tmp
-# fix for bug http://rt.perl.org/rt3//Public/Bug/Display.html?id=79410 
+# fix for bug http://rt.perl.org/rt3//Public/Bug/Display.html?id=79410
 # "Pod2man creates wrong ROFF esc sequences for Latin-1 characters."
 # Create groff (specific) escape sequences which work also on DOS/Windows.
 # See also: https://rt.cpan.org/Public/Bug/Display.html?id=73804
diff --git a/man/man1/dos2unix.pod b/man/man1/dos2unix.pod
index 43601da..b06676f 100644
--- a/man/man1/dos2unix.pod
+++ b/man/man1/dos2unix.pod
@@ -3,7 +3,7 @@
 #
 #   Copyright (C) 2009-2012 Erwin Waterlander
 #   All rights reserved.
-# 
+#
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #   are met:
@@ -12,7 +12,7 @@
 #   2. Redistributions in binary form must reproduce the above copyright
 #      notice in the documentation and/or other materials provided with
 #      the distribution.
-# 
+#
 #   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
 #   EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 #   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
diff --git a/man/nl/man1/dos2unix.pod b/man/nl/man1/dos2unix.pod
index 7c5c1c0..95b82cc 100644
--- a/man/nl/man1/dos2unix.pod
+++ b/man/nl/man1/dos2unix.pod
@@ -3,7 +3,7 @@
 #
 #   Copyright (C) 2009-2012 Erwin Waterlander
 #   All rights reserved.
-# 
+#
 #   Redistribution and use in source and binary forms, with or without
 #   modification, are permitted provided that the following conditions
 #   are met:
@@ -12,7 +12,7 @@
 #   2. Redistributions in binary form must reproduce the above copyright
 #      notice in the documentation and/or other materials provided with
 #      the distribution.
-# 
+#
 #   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
 #   EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 #   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -57,7 +57,7 @@ dos2unix - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter
 
 =head1 BESCHRIJVING
 
-Het Dos2unix pakket bevat toepassingen C<dos2unix> en C<unix2dos> om 
+Het Dos2unix pakket bevat toepassingen C<dos2unix> en C<unix2dos> om
 platte tekstbestanden in DOS of Mac formaat naar Unix om te zetten en
 vice versa.
 
@@ -66,7 +66,7 @@ twee tekens: een 'Carriage Return' (CR) gevolgd door een 'Line Feed' (LF). In
 Unix tekstbestanden bestaat een regeleinde uit een enkel 'Newline' teken die
 gelijk is aan een DOS 'Line Feed' (LF) teken.  In Mac tekst bestanden, voor Mac
 OS X, bestaan regeleindes uit een enkel 'Carriage Return' teken. Mac OS X is
-Unix gebaseerd en heeft dezelfde regeleindes als Unix. 
+Unix gebaseerd en heeft dezelfde regeleindes als Unix.
 
 Binaire bestanden worden automatisch overgeslagen, behalve als de omzetting
 geforceerd wordt.
@@ -407,7 +407,7 @@ Omzetten en vervangen a.txt. Omzetten en vervangen b.txt.
     dos2unix a.txt b.txt
     dos2unix -o a.txt b.txt
 
-Omzetten en vervangen a.txt in ascii conversiemodus. 
+Omzetten en vervangen a.txt in ascii conversiemodus.
 
     dos2unix a.txt
 
@@ -439,7 +439,7 @@ Omzetten a.txt en schrijf naar e.txt.
 
 Omzetten a.txt en schrijf naar e.txt, behoud datum e.txt gelijk aan a.txt.
 
-    dos2unix -k -n a.txt e.txt 
+    dos2unix -k -n a.txt e.txt
 
 Omzetten en vervangen a.txt. Omzetten b.txt en schrijf naar e.txt.
 
diff --git a/po/de.po b/po/de.po
index c48a39e..32715b5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-20 18:54+0200\n"
+"POT-Creation-Date: 2012-08-27 21:28+0200\n"
 "PO-Revision-Date: 2010-01-24 09:00+0100\n"
 "Last-Translator: Philipp Thomas <psmt@opensuse.org>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -35,126 +35,132 @@ msgstr ""
 "Alle Rechte vorbehalten.\n"
 "\n"
 
-#: dos2unix.c:169 dos2unix.c:200 dos2unix.c:224 dos2unix.c:323 dos2unix.c:351
-#: dos2unix.c:372 unix2dos.c:152 unix2dos.c:183 unix2dos.c:202 unix2dos.c:219
-#: unix2dos.c:331 unix2dos.c:359 unix2dos.c:375 unix2dos.c:389
+#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
+#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#, c-format
+msgid "Binary symbol found at line %d\n"
+msgstr "Ein binäres Symbol wurde in Zeile %d gefunden\n"
+
+#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
+#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
+#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
 msgid "can not write to output file\n"
 msgstr "In die Ausgabedatei kann nicht geschrieben werden\n"
 
-#: dos2unix.c:239 dos2unix.c:386 unix2dos.c:234 unix2dos.c:403
+#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "Programmfehler, der Konvertierungsmodus %d ist unzulässig\n"
 
-#: dos2unix.c:293 unix2dos.c:288
+#: dos2unix.c:310 unix2dos.c:303
 #, c-format
 msgid "using code page %d.\n"
 msgstr "Codepage %d wird verwendet.\n"
 
-#: dos2unix.c:474 unix2dos.c:491
+#: dos2unix.c:506 unix2dos.c:519
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "Die temporäre Ausgabedatei konnte nicht geöffnet werden: %s\n"
 
-#: dos2unix.c:481 unix2dos.c:498
+#: dos2unix.c:513 unix2dos.c:526
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "%s wird als temporäre Datei verwendet\n"
 
-#: dos2unix.c:610 unix2dos.c:627
+#: dos2unix.c:642 unix2dos.c:655
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr "Das Ändern der Rechte der temporären Ausgabedatei %s scheiterte: %s\n"
 
-#: dos2unix.c:629 unix2dos.c:646
+#: dos2unix.c:661 unix2dos.c:674
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Das Ändern des Eigentümers und der Gruppe der temporären Ausgabedatei %s "
 "scheiterte: %s\n"
 
-#: dos2unix.c:682 unix2dos.c:699
+#: dos2unix.c:714 unix2dos.c:727
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "es gab Probleme beim Auflösen der symbolischen Verknüpfung »%s«\n"
 
-#: dos2unix.c:683 dos2unix.c:717 unix2dos.c:700 unix2dos.c:734
+#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          Die Ausgabedatei verbleibt in »%s«\n"
 
-#: dos2unix.c:712 unix2dos.c:729
+#: dos2unix.c:744 unix2dos.c:757
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "Beim Umbenennen von »%s« zu »%s« sind Probleme aufgetreten: %s\n"
 
-#: dos2unix.c:715 unix2dos.c:732
+#: dos2unix.c:747 unix2dos.c:760
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          welche das Ziel der symbolischen Verknüpfung »%s« ist\n"
 
-#: dos2unix.c:807 unix2dos.c:824
+#: dos2unix.c:839 unix2dos.c:852
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr ""
 "Fehler: Der Inhalt der Umgebungsvariablen DOS2UNIX_LOCALEDIR ist zu lang.\n"
 
-#: dos2unix.c:904 dos2unix.c:935 unix2dos.c:921 unix2dos.c:952
+#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
 #, c-format
 msgid "active code page: %d\n"
 msgstr "aktive Codepage: %d\n"
 
-#: dos2unix.c:945 unix2dos.c:962
+#: dos2unix.c:983 unix2dos.c:996
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "Der angegebene Konvertierungsmodus %s ist unzulässig\n"
 
-#: dos2unix.c:955 unix2dos.c:972
+#: dos2unix.c:993 unix2dos.c:1006
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "Die Option »%s« benötigt ein Argument\n"
 
-#: dos2unix.c:968 dos2unix.c:982 dos2unix.c:1176 unix2dos.c:985 unix2dos.c:999
-#: unix2dos.c:1199
+#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
+#: unix2dos.c:1033 unix2dos.c:1233
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr "Das Ziel der Datei %s wurde für den Neudatei-Modus nicht angegeben\n"
 
-#: dos2unix.c:1012 dos2unix.c:1096 unix2dos.c:1029 unix2dos.c:1116
+#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "%s wird übersprungen, da es keine reguläre Datei ist\n"
 
-#: dos2unix.c:1019 unix2dos.c:1036
+#: dos2unix.c:1057 unix2dos.c:1070
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr ""
 "%s wird übersprungen, Ausgabedatei %s ist eine symbolische Verknüpfung.\n"
 
-#: dos2unix.c:1026 dos2unix.c:1110 unix2dos.c:1043 unix2dos.c:1130
+#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr ""
 "Symbolische Verknüpfung %s wird übersprungen da das Ziel keine reguläre "
 "Datei ist.\n"
 
-#: dos2unix.c:1033 unix2dos.c:1050
+#: dos2unix.c:1071 unix2dos.c:1084
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr ""
 "%s wird übersprungen, das Ziel der symbolischen Verknüpfung %s ist keine "
 "reguläre Datei.\n"
 
-#: dos2unix.c:1040 dos2unix.c:1117 unix2dos.c:1057 unix2dos.c:1137
+#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "binäre Datei %s wird übersprungen\n"
 
-#: dos2unix.c:1047 dos2unix.c:1124 unix2dos.c:1064 unix2dos.c:1144
+#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "Codepage %d wird nicht unterstützt.\n"
 
-#: dos2unix.c:1054 dos2unix.c:1131 unix2dos.c:1071 unix2dos.c:1151
+#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -163,38 +169,38 @@ msgstr ""
 "UTF-16 Datei %s wird übersprungen, da die derzeitige Zeichenkodierung nicht "
 "UTF-8 ist.\n"
 
-#: dos2unix.c:1061 dos2unix.c:1138 unix2dos.c:1078 unix2dos.c:1158
+#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "UTF-16 Datei %s wird übersprungen, da wchar_t %d Bytes groß ist.\n"
 
-#: dos2unix.c:1068 dos2unix.c:1145 unix2dos.c:1085 unix2dos.c:1165
+#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr ""
 "UTF-16 Datei %s wird übersprungen, da beim Umwandeln ein Fehler auftrat.\n"
 
-#: dos2unix.c:1074
+#: dos2unix.c:1112
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "Datei %s wird zu Datei %s im Unix-Format umgewandelt ...\n"
 
-#: dos2unix.c:1081 unix2dos.c:1101
+#: dos2unix.c:1119 unix2dos.c:1135
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "Beim Konvertieren von Datei %s zu Datei %s sind Probleme aufgetreten\n"
 
-#: dos2unix.c:1103 unix2dos.c:1123
+#: dos2unix.c:1141 unix2dos.c:1157
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Symbolische Verknüpfung %s wird übersprungen.\n"
 
-#: dos2unix.c:1151
+#: dos2unix.c:1189
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "Datei %s wird ins Unix-Format umgewandelt ...\n"
 
-#: dos2unix.c:1158 unix2dos.c:1181
+#: dos2unix.c:1196 unix2dos.c:1215
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "Beim Umwandeln von Datei %s sind Probleme aufgetreten\n"
@@ -211,22 +217,22 @@ msgstr ""
 "Alle Rechte vorbehalten.\n"
 "\n"
 
-#: unix2dos.c:1092
+#: unix2dos.c:1126
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "Datei %s wird in Datei %s im Mac-Format konvertiert ...\n"
 
-#: unix2dos.c:1094
+#: unix2dos.c:1128
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "Datei %s wird in Datei %s im DOS-Format konvertiert ...\n"
 
-#: unix2dos.c:1172
+#: unix2dos.c:1206
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "Datei %s wird ins Mac-Format konvertiert ...\n"
 
-#: unix2dos.c:1174
+#: unix2dos.c:1208
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "Datei %s wird ins DOS-Format konvertiert ...\n"
@@ -398,17 +404,23 @@ msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows 32 bit Version (MinGW).\n"
 
 #: common.c:259
-msgid "OS/2 version.\n"
+#, fuzzy
+msgid "OS/2 version (WATCOMC).\n"
+msgstr "DOS 32 bit Version (WATCOMC).\n"
+
+#: common.c:261
+#, fuzzy
+msgid "OS/2 version (EMX).\n"
 msgstr "OS/2 Version.\n"
 
-#: common.c:262
+#: common.c:264
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Mit Unterstützung für Unicode UTF-16.\n"
 
-#: common.c:264
+#: common.c:266
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Ohne Unterstützung für Unicode UTF-16.\n"
 
-#: common.c:267
+#: common.c:269
 msgid "With native language support.\n"
 msgstr "Mit Unterstützung von Landessprachen.\n"
diff --git a/po/dos2unix.pot b/po/dos2unix.pot
index bc3307a..e30e008 100644
--- a/po/dos2unix.pot
+++ b/po/dos2unix.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-20 18:54+0200\n"
+"POT-Creation-Date: 2012-09-06 20:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,155 +27,161 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:169 dos2unix.c:200 dos2unix.c:224 dos2unix.c:323 dos2unix.c:351
-#: dos2unix.c:372 unix2dos.c:152 unix2dos.c:183 unix2dos.c:202 unix2dos.c:219
-#: unix2dos.c:331 unix2dos.c:359 unix2dos.c:375 unix2dos.c:389
+#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
+#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#, c-format
+msgid "Binary symbol found at line %d\n"
+msgstr ""
+
+#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
+#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
+#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
 msgid "can not write to output file\n"
 msgstr ""
 
-#: dos2unix.c:239 dos2unix.c:386 unix2dos.c:234 unix2dos.c:403
+#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr ""
 
-#: dos2unix.c:293 unix2dos.c:288
+#: dos2unix.c:310 unix2dos.c:303
 #, c-format
 msgid "using code page %d.\n"
 msgstr ""
 
-#: dos2unix.c:474 unix2dos.c:491
+#: dos2unix.c:506 unix2dos.c:519
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr ""
 
-#: dos2unix.c:481 unix2dos.c:498
+#: dos2unix.c:513 unix2dos.c:526
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr ""
 
-#: dos2unix.c:610 unix2dos.c:627
+#: dos2unix.c:642 unix2dos.c:655
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr ""
 
-#: dos2unix.c:629 unix2dos.c:646
+#: dos2unix.c:661 unix2dos.c:674
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 
-#: dos2unix.c:682 unix2dos.c:699
+#: dos2unix.c:714 unix2dos.c:727
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr ""
 
-#: dos2unix.c:683 dos2unix.c:717 unix2dos.c:700 unix2dos.c:734
+#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr ""
 
-#: dos2unix.c:712 unix2dos.c:729
+#: dos2unix.c:744 unix2dos.c:757
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr ""
 
-#: dos2unix.c:715 unix2dos.c:732
+#: dos2unix.c:747 unix2dos.c:760
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr ""
 
-#: dos2unix.c:807 unix2dos.c:824
+#: dos2unix.c:839 unix2dos.c:852
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr ""
 
-#: dos2unix.c:904 dos2unix.c:935 unix2dos.c:921 unix2dos.c:952
+#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
 #, c-format
 msgid "active code page: %d\n"
 msgstr ""
 
-#: dos2unix.c:945 unix2dos.c:962
+#: dos2unix.c:983 unix2dos.c:996
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr ""
 
-#: dos2unix.c:955 unix2dos.c:972
+#: dos2unix.c:993 unix2dos.c:1006
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr ""
 
-#: dos2unix.c:968 dos2unix.c:982 dos2unix.c:1176 unix2dos.c:985 unix2dos.c:999
-#: unix2dos.c:1199
+#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
+#: unix2dos.c:1033 unix2dos.c:1233
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr ""
 
-#: dos2unix.c:1012 dos2unix.c:1096 unix2dos.c:1029 unix2dos.c:1116
+#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr ""
 
-#: dos2unix.c:1019 unix2dos.c:1036
+#: dos2unix.c:1057 unix2dos.c:1070
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr ""
 
-#: dos2unix.c:1026 dos2unix.c:1110 unix2dos.c:1043 unix2dos.c:1130
+#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr ""
 
-#: dos2unix.c:1033 unix2dos.c:1050
+#: dos2unix.c:1071 unix2dos.c:1084
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr ""
 
-#: dos2unix.c:1040 dos2unix.c:1117 unix2dos.c:1057 unix2dos.c:1137
+#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr ""
 
-#: dos2unix.c:1047 dos2unix.c:1124 unix2dos.c:1064 unix2dos.c:1144
+#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr ""
 
-#: dos2unix.c:1054 dos2unix.c:1131 unix2dos.c:1071 unix2dos.c:1151
+#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
 "UTF-8.\n"
 msgstr ""
 
-#: dos2unix.c:1061 dos2unix.c:1138 unix2dos.c:1078 unix2dos.c:1158
+#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr ""
 
-#: dos2unix.c:1068 dos2unix.c:1145 unix2dos.c:1085 unix2dos.c:1165
+#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr ""
 
-#: dos2unix.c:1074
+#: dos2unix.c:1112
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr ""
 
-#: dos2unix.c:1081 unix2dos.c:1101
+#: dos2unix.c:1119 unix2dos.c:1135
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr ""
 
-#: dos2unix.c:1103 unix2dos.c:1123
+#: dos2unix.c:1141 unix2dos.c:1157
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr ""
 
-#: dos2unix.c:1151
+#: dos2unix.c:1189
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr ""
 
-#: dos2unix.c:1158 unix2dos.c:1181
+#: dos2unix.c:1196 unix2dos.c:1215
 #, c-format
 msgid "problems converting file %s\n"
 msgstr ""
@@ -188,22 +194,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: unix2dos.c:1092
+#: unix2dos.c:1126
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr ""
 
-#: unix2dos.c:1094
+#: unix2dos.c:1128
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr ""
 
-#: unix2dos.c:1172
+#: unix2dos.c:1206
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr ""
 
-#: unix2dos.c:1174
+#: unix2dos.c:1208
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr ""
@@ -315,17 +321,21 @@ msgid "Windows 32 bit version (MinGW).\n"
 msgstr ""
 
 #: common.c:259
-msgid "OS/2 version.\n"
+msgid "OS/2 version (WATCOMC).\n"
 msgstr ""
 
-#: common.c:262
-msgid "With Unicode UTF-16 support.\n"
+#: common.c:261
+msgid "OS/2 version (EMX).\n"
 msgstr ""
 
 #: common.c:264
+msgid "With Unicode UTF-16 support.\n"
+msgstr ""
+
+#: common.c:266
 msgid "Without Unicode UTF-16 support.\n"
 msgstr ""
 
-#: common.c:267
+#: common.c:269
 msgid "With native language support.\n"
 msgstr ""
diff --git a/po/eo-x.po b/po/eo-x.po
index f8a5a9d..9832a89 100644
--- a/po/eo-x.po
+++ b/po/eo-x.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 5.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-20 18:54+0200\n"
+"POT-Creation-Date: 2012-08-27 21:28+0200\n"
 "PO-Revision-Date: 2010-03-07 19:50+0100\n"
 "Last-Translator: Rugxulo <rugxulo@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -27,121 +27,127 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:169 dos2unix.c:200 dos2unix.c:224 dos2unix.c:323 dos2unix.c:351
-#: dos2unix.c:372 unix2dos.c:152 unix2dos.c:183 unix2dos.c:202 unix2dos.c:219
-#: unix2dos.c:331 unix2dos.c:359 unix2dos.c:375 unix2dos.c:389
+#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
+#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#, c-format
+msgid "Binary symbol found at line %d\n"
+msgstr "Netekstan signon trovigxis cxe linio %d\n"
+
+#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
+#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
+#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
 msgid "can not write to output file\n"
 msgstr "ne povas registri dosieren\n"
 
-#: dos2unix.c:239 dos2unix.c:386 unix2dos.c:234 unix2dos.c:403
+#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "programa eraro, negxustan sxangxmodon %d\n"
 
-#: dos2unix.c:293 unix2dos.c:288
+#: dos2unix.c:310 unix2dos.c:303
 #, c-format
 msgid "using code page %d.\n"
 msgstr "uzante kodpagxon %d.\n"
 
-#: dos2unix.c:474 unix2dos.c:491
+#: dos2unix.c:506 unix2dos.c:519
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "malsukcesis malfermi provizoran dosieron registran: %s\n"
 
-#: dos2unix.c:481 unix2dos.c:498
+#: dos2unix.c:513 unix2dos.c:526
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "uzante %s kiel provizora dosiero\n"
 
-#: dos2unix.c:610 unix2dos.c:627
+#: dos2unix.c:642 unix2dos.c:655
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr ""
 "Malsukcesis sxangxi la permesajxojn de la provizora eldona dosiero %s: %s\n"
 
-#: dos2unix.c:629 unix2dos.c:646
+#: dos2unix.c:661 unix2dos.c:674
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Malsukcesis sxangxi la proprietulon kaj grupon de la provizora eldona "
 "dosiero %s: %s\n"
 
-#: dos2unix.c:682 unix2dos.c:699
+#: dos2unix.c:714 unix2dos.c:727
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "erarojn legante dosieran cxeneron '%s'\n"
 
-#: dos2unix.c:683 dos2unix.c:717 unix2dos.c:700 unix2dos.c:734
+#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          kreatan dosieron restas en '%s'\n"
 
-#: dos2unix.c:712 unix2dos.c:729
+#: dos2unix.c:744 unix2dos.c:757
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "problemojn trovitajn renomigi '%s' al '%s': %s\n"
 
-#: dos2unix.c:715 unix2dos.c:732
+#: dos2unix.c:747 unix2dos.c:760
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          kiu estas la atingon de dosiera cxenero '%s'\n"
 
-#: dos2unix.c:807 unix2dos.c:824
+#: dos2unix.c:839 unix2dos.c:852
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr "eraro: DOS2UNIX_LOCALEDIR tro longigxis.\n"
 
-#: dos2unix.c:904 dos2unix.c:935 unix2dos.c:921 unix2dos.c:952
+#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
 #, c-format
 msgid "active code page: %d\n"
 msgstr "nuntempa kodpagxo: %d\n"
 
-#: dos2unix.c:945 unix2dos.c:962
+#: dos2unix.c:983 unix2dos.c:996
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "neuzebla %s sxangxmodo menciita\n"
 
-#: dos2unix.c:955 unix2dos.c:972
+#: dos2unix.c:993 unix2dos.c:1006
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "elekto '%s' bezonas elekto-vorton\n"
 
-#: dos2unix.c:968 dos2unix.c:982 dos2unix.c:1176 unix2dos.c:985 unix2dos.c:999
-#: unix2dos.c:1199
+#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
+#: unix2dos.c:1033 unix2dos.c:1233
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr "ejon de dosiero %s ne menciita en novmodo dosiera\n"
 
-#: dos2unix.c:1012 dos2unix.c:1096 unix2dos.c:1029 unix2dos.c:1116
+#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "Pasante %s, dosiero ne taugxa.\n"
 
-#: dos2unix.c:1019 unix2dos.c:1036
+#: dos2unix.c:1057 unix2dos.c:1070
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr "Evitante %s, atingan dosieron %s jam estas dosiera cxenero.\n"
 
-#: dos2unix.c:1026 dos2unix.c:1110 unix2dos.c:1043 unix2dos.c:1130
+#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr "Evitante dosieran cxeneron %s, atingon ne estas normala dosiero.\n"
 
-#: dos2unix.c:1033 unix2dos.c:1050
+#: dos2unix.c:1071 unix2dos.c:1084
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr "Evitante %s, atingon de dosiera cxenero %s ne estas normala dosiero.\n"
 
-#: dos2unix.c:1040 dos2unix.c:1117 unix2dos.c:1057 unix2dos.c:1137
+#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "Pasante ne-tekstan dosieron %s\n"
 
-#: dos2unix.c:1047 dos2unix.c:1124 unix2dos.c:1064 unix2dos.c:1144
+#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "kodpagxo %d ne estas konvertebla.\n"
 
-#: dos2unix.c:1054 dos2unix.c:1131 unix2dos.c:1071 unix2dos.c:1151
+#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -150,37 +156,37 @@ msgstr ""
 "Evitante UTF-16 dosieron %s, la nuntempa lingvo-loka litero-enkodigxo ne "
 "egalas UTF-8.\n"
 
-#: dos2unix.c:1061 dos2unix.c:1138 unix2dos.c:1078 unix2dos.c:1158
+#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "Evitante UTF-16 dosieron %s, la mezuro da wchar_t estas %d okopoj.\n"
 
-#: dos2unix.c:1068 dos2unix.c:1145 unix2dos.c:1085 unix2dos.c:1165
+#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr "Evitante UTF-16 dosieron %s, eraro de UTF-16 tradukigxo okazis.\n"
 
-#: dos2unix.c:1074
+#: dos2unix.c:1112
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "sxangxante dosieron %s al dosiero %s Unix-en ...\n"
 
-#: dos2unix.c:1081 unix2dos.c:1101
+#: dos2unix.c:1119 unix2dos.c:1135
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "problemojn trovitajn dum sxangxi dosiero %s al dosiero %s\n"
 
-#: dos2unix.c:1103 unix2dos.c:1123
+#: dos2unix.c:1141 unix2dos.c:1157
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Evitante dosieran cxeneron %s.\n"
 
-#: dos2unix.c:1151
+#: dos2unix.c:1189
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "sxangxante dosiero %s Unix-en ...\n"
 
-#: dos2unix.c:1158 unix2dos.c:1181
+#: dos2unix.c:1196 unix2dos.c:1215
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "problemojn dum sxangxi dosiero %s\n"
@@ -193,22 +199,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: unix2dos.c:1092
+#: unix2dos.c:1126
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "sxangxante dosiero %s al dosiero %s Mac-en ...\n"
 
-#: unix2dos.c:1094
+#: unix2dos.c:1128
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "sxangxante dosiero %s al dosiero %s DOS-en ...\n"
 
-#: unix2dos.c:1172
+#: unix2dos.c:1206
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "sxangxante dosiero %s Mac-en ...\n"
 
-#: unix2dos.c:1174
+#: unix2dos.c:1208
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "sxangxante dosiero %s DOS-en ...\n"
@@ -353,17 +359,23 @@ msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows-32 eldono (MinGW).\n"
 
 #: common.c:259
-msgid "OS/2 version.\n"
+#, fuzzy
+msgid "OS/2 version (WATCOMC).\n"
+msgstr "DOS-32 eldono (WATCOMC).\n"
+
+#: common.c:261
+#, fuzzy
+msgid "OS/2 version (EMX).\n"
 msgstr "OS/2 eldono.\n"
 
-#: common.c:262
+#: common.c:264
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Kun subteno de Unikodo da UTF-16.\n"
 
-#: common.c:264
+#: common.c:266
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Sen subteno de Unikodo da UTF-16.\n"
 
-#: common.c:267
+#: common.c:269
 msgid "With native language support.\n"
 msgstr "Uzante denaskan lingvon sistemon.\n"
diff --git a/po/eo.po b/po/eo.po
index 5bd7fe8..47fdaf4 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 5.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-30 09:25+0200\n"
+"POT-Creation-Date: 2012-08-27 21:28+0200\n"
 "PO-Revision-Date: 2010-03-07 19:50+0100\n"
 "Last-Translator: Ruĝulo <ruĝulo@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -27,158 +27,166 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:169 dos2unix.c:200 dos2unix.c:224 dos2unix.c:323 dos2unix.c:351
-#: dos2unix.c:372 unix2dos.c:152 unix2dos.c:183 unix2dos.c:202 unix2dos.c:219
-#: unix2dos.c:331 unix2dos.c:359 unix2dos.c:375 unix2dos.c:389
+#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
+#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#, c-format
+msgid "Binary symbol found at line %d\n"
+msgstr "Netekstan signon troviĝis ĉe linio %d\n"
+
+#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
+#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
+#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
 msgid "can not write to output file\n"
 msgstr "ne povas registri dosieren\n"
 
-#: dos2unix.c:239 dos2unix.c:386 unix2dos.c:234 unix2dos.c:403
+#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "programa eraro, neĝustan ŝanĝmodon %d\n"
 
-#: dos2unix.c:293 unix2dos.c:288
+#: dos2unix.c:310 unix2dos.c:303
 #, c-format
 msgid "using code page %d.\n"
 msgstr "uzante kodpaĝon %d.\n"
 
-#: dos2unix.c:474 unix2dos.c:491
+#: dos2unix.c:506 unix2dos.c:519
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "malsukcesis malfermi provizoran dosieron registran: %s\n"
 
-#: dos2unix.c:481 unix2dos.c:498
+#: dos2unix.c:513 unix2dos.c:526
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "uzante %s kiel provizora dosiero\n"
 
-#: dos2unix.c:610 unix2dos.c:627
+#: dos2unix.c:642 unix2dos.c:655
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr ""
 "Malsukcesis ŝanĝi la permesaĵojn de la provizora eldona dosiero %s: %s\n"
 
-#: dos2unix.c:629 unix2dos.c:646
+#: dos2unix.c:661 unix2dos.c:674
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Malsukcesis ŝanĝi la proprietulon kaj grupon de la provizora eldona dosiero "
 "%s: %s\n"
 
-#: dos2unix.c:682 unix2dos.c:699
+#: dos2unix.c:714 unix2dos.c:727
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "erarojn legante dosieran ĉeneron '%s'\n"
 
-#: dos2unix.c:683 dos2unix.c:717 unix2dos.c:700 unix2dos.c:734
+#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          kreatan dosieron restas en '%s'\n"
 
-#: dos2unix.c:712 unix2dos.c:729
+#: dos2unix.c:744 unix2dos.c:757
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "problemojn trovitajn renomigi '%s' al '%s': %s\n"
 
-#: dos2unix.c:715 unix2dos.c:732
+#: dos2unix.c:747 unix2dos.c:760
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          kiu estas la atingon de dosiera ĉenero '%s'\n"
 
-#: dos2unix.c:807 unix2dos.c:824
+#: dos2unix.c:839 unix2dos.c:852
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr "eraro: DOS2UNIX_LOCALEDIR tro longiĝis.\n"
 
-#: dos2unix.c:904 dos2unix.c:935 unix2dos.c:921 unix2dos.c:952
+#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
 #, c-format
 msgid "active code page: %d\n"
 msgstr "nuntempa kodpaĝo: %d\n"
 
-#: dos2unix.c:945 unix2dos.c:962
+#: dos2unix.c:983 unix2dos.c:996
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "neuzebla %s ŝanĝmodo menciita\n"
 
-#: dos2unix.c:955 unix2dos.c:972
+#: dos2unix.c:993 unix2dos.c:1006
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "elekto '%s' bezonas elekto-vorton\n"
 
-#: dos2unix.c:968 dos2unix.c:982 dos2unix.c:1176 unix2dos.c:985 unix2dos.c:999
-#: unix2dos.c:1199
+#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
+#: unix2dos.c:1033 unix2dos.c:1233
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr "ejon de dosiero %s ne menciita en novmodo dosiera\n"
 
-#: dos2unix.c:1012 dos2unix.c:1096 unix2dos.c:1029 unix2dos.c:1116
+#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "Pasante %s, dosiero ne tauĝa.\n"
 
-#: dos2unix.c:1019 unix2dos.c:1036
+#: dos2unix.c:1057 unix2dos.c:1070
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr "Evitante %s, atingan dosieron %s jam estas dosiera ĉenero.\n"
 
-#: dos2unix.c:1026 dos2unix.c:1110 unix2dos.c:1043 unix2dos.c:1130
+#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr "Evitante dosieran ĉeneron %s, atingon ne estas normala dosiero.\n"
 
-#: dos2unix.c:1033 unix2dos.c:1050
+#: dos2unix.c:1071 unix2dos.c:1084
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr "Evitante %s, atingon de dosiera ĉenero %s ne estas normala dosiero.\n"
 
-#: dos2unix.c:1040 dos2unix.c:1117 unix2dos.c:1057 unix2dos.c:1137
+#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "Pasante ne-tekstan dosieron %s\n"
 
-#: dos2unix.c:1047 dos2unix.c:1124 unix2dos.c:1064 unix2dos.c:1144
+#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "kodpaĝo %d ne estas konvertebla.\n"
 
-#: dos2unix.c:1054 dos2unix.c:1131 unix2dos.c:1071 unix2dos.c:1151
+#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
 "UTF-8.\n"
-msgstr "Evitante UTF-16 dosieron %s, la nuntempa lingvo-loka litero-enkodiĝo ne egalas UTF-8.\n"
+msgstr ""
+"Evitante UTF-16 dosieron %s, la nuntempa lingvo-loka litero-enkodiĝo ne "
+"egalas UTF-8.\n"
 
-#: dos2unix.c:1061 dos2unix.c:1138 unix2dos.c:1078 unix2dos.c:1158
+#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "Evitante UTF-16 dosieron %s, la mezuro da wchar_t estas %d okopoj.\n"
 
-#: dos2unix.c:1068 dos2unix.c:1145 unix2dos.c:1085 unix2dos.c:1165
+#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr "Evitante UTF-16 dosieron %s, eraro de UTF-16 tradukiĝo okazis.\n"
 
-#: dos2unix.c:1074
+#: dos2unix.c:1112
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "ŝanĝante dosieron %s al dosiero %s Unix-en ...\n"
 
-#: dos2unix.c:1081 unix2dos.c:1101
+#: dos2unix.c:1119 unix2dos.c:1135
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "problemojn trovitajn dum ŝanĝi dosiero %s al dosiero %s\n"
 
-#: dos2unix.c:1103 unix2dos.c:1123
+#: dos2unix.c:1141 unix2dos.c:1157
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Evitante dosieran ĉeneron %s.\n"
 
-#: dos2unix.c:1151
+#: dos2unix.c:1189
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "ŝanĝante dosiero %s Unix-en ...\n"
 
-#: dos2unix.c:1158 unix2dos.c:1181
+#: dos2unix.c:1196 unix2dos.c:1215
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "problemojn dum ŝanĝi dosiero %s\n"
@@ -191,22 +199,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: unix2dos.c:1092
+#: unix2dos.c:1126
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "ŝanĝante dosiero %s al dosiero %s Mac-en ...\n"
 
-#: unix2dos.c:1094
+#: unix2dos.c:1128
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "ŝanĝante dosiero %s al dosiero %s DOS-en ...\n"
 
-#: unix2dos.c:1172
+#: unix2dos.c:1206
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "ŝanĝante dosiero %s Mac-en ...\n"
 
-#: unix2dos.c:1174
+#: unix2dos.c:1208
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "ŝanĝante dosiero %s DOS-en ...\n"
@@ -351,17 +359,23 @@ msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows-32 eldono (MinGW).\n"
 
 #: common.c:259
-msgid "OS/2 version.\n"
+#, fuzzy
+msgid "OS/2 version (WATCOMC).\n"
+msgstr "DOS-32 eldono (WATCOMC).\n"
+
+#: common.c:261
+#, fuzzy
+msgid "OS/2 version (EMX).\n"
 msgstr "OS/2 eldono.\n"
 
-#: common.c:262
+#: common.c:264
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Kun subteno de Unikodo da UTF-16.\n"
 
-#: common.c:264
+#: common.c:266
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Sen subteno de Unikodo da UTF-16.\n"
 
-#: common.c:267
+#: common.c:269
 msgid "With native language support.\n"
 msgstr "Uzante denaskan lingvon sistemon.\n"
diff --git a/po/es.po b/po/es.po
index 884468b..7e684a8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,13 +2,13 @@
 # Traducciones al espa�ol para el paquete dos2unix.
 # Copyright (C) 2011,2012 THE dos2unix'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the dos2unix package.
-# Julio A. Freyre-Gonzalez <jfreyreg@gmail.com>, 2011.
+# Julio A. Freyre-Gonzalez <jfreyreg@gmail.com>, 2011,2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-20 18:54+0200\n"
+"POT-Creation-Date: 2012-08-27 21:28+0200\n"
 "PO-Revision-Date: 2011-06-20 09:13+0200\n"
 "Last-Translator:  <jfreyreg@gmail.com>\n"
 "Language-Team: Spanish\n"
@@ -28,162 +28,168 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:169 dos2unix.c:200 dos2unix.c:224 dos2unix.c:323 dos2unix.c:351
-#: dos2unix.c:372 unix2dos.c:152 unix2dos.c:183 unix2dos.c:202 unix2dos.c:219
-#: unix2dos.c:331 unix2dos.c:359 unix2dos.c:375 unix2dos.c:389
+#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
+#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#, c-format
+msgid "Binary symbol found at line %d\n"
+msgstr "S�mbolo binario encontrado en la l�nea %d\n"
+
+#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
+#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
+#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
 msgid "can not write to output file\n"
 msgstr "no puedo escribir al archivo de salida\n"
 
-#: dos2unix.c:239 dos2unix.c:386 unix2dos.c:234 unix2dos.c:403
+#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "error, modo de conversi�n %d inv�lido\n"
 
-#: dos2unix.c:293 unix2dos.c:288
+#: dos2unix.c:310 unix2dos.c:303
 #, c-format
 msgid "using code page %d.\n"
 msgstr "usando p�gina de c�digos %d.\n"
 
-#: dos2unix.c:474 unix2dos.c:491
+#: dos2unix.c:506 unix2dos.c:519
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "Fall� al abrir el archivo de salida temporal: %s\n"
 
-#: dos2unix.c:481 unix2dos.c:498
+#: dos2unix.c:513 unix2dos.c:526
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "usando %s como archivo temporal\n"
 
-#: dos2unix.c:610 unix2dos.c:627
+#: dos2unix.c:642 unix2dos.c:655
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr "Error al cambiar los permisos del archivo temporal de salida %s: %s\n"
 
-#: dos2unix.c:629 unix2dos.c:646
+#: dos2unix.c:661 unix2dos.c:674
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Error al cambiar el propietario y grupo del archivo temporal de salida %s: "
 "%s\n"
 
-#: dos2unix.c:682 unix2dos.c:699
+#: dos2unix.c:714 unix2dos.c:727
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "problemas al resolver el enlace simb�lico '%s'\n"
 
-#: dos2unix.c:683 dos2unix.c:717 unix2dos.c:700 unix2dos.c:734
+#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          el archivo de salida permanece en '%s'\n"
 
-#: dos2unix.c:712 unix2dos.c:729
+#: dos2unix.c:744 unix2dos.c:757
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "problemas al renombrar '%s' como '%s': %s\n"
 
-#: dos2unix.c:715 unix2dos.c:732
+#: dos2unix.c:747 unix2dos.c:760
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          cual es el destino del enlace simb�lico '%s'\n"
 
-#: dos2unix.c:807 unix2dos.c:824
+#: dos2unix.c:839 unix2dos.c:852
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr ""
 "error: El valor de la variable de entorno DOS2UNIX_LOCALEDIR es demasiado "
 "largo.\n"
 
-#: dos2unix.c:904 dos2unix.c:935 unix2dos.c:921 unix2dos.c:952
+#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
 #, c-format
 msgid "active code page: %d\n"
 msgstr "P�gina de c�digos activa: %d\n"
 
-#: dos2unix.c:945 unix2dos.c:962
+#: dos2unix.c:983 unix2dos.c:996
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "modo de conversi�n %s especificado es inv�lido\n"
 
-#: dos2unix.c:955 unix2dos.c:972
+#: dos2unix.c:993 unix2dos.c:1006
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "el par�metro '%s' requiere un argumento\n"
 
-#: dos2unix.c:968 dos2unix.c:982 dos2unix.c:1176 unix2dos.c:985 unix2dos.c:999
-#: unix2dos.c:1199
+#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
+#: unix2dos.c:1033 unix2dos.c:1233
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr ""
 "el destino del archivo %s no se especific� en el modo de archivo nuevo\n"
 
-#: dos2unix.c:1012 dos2unix.c:1096 unix2dos.c:1029 unix2dos.c:1116
+#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "Ignorando %s, no es un archivo regular.\n"
 
-#: dos2unix.c:1019 unix2dos.c:1036
+#: dos2unix.c:1057 unix2dos.c:1070
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr "Ignorando %s, el archivo de salida %s es un enlace simb�lico.\n"
 
-#: dos2unix.c:1026 dos2unix.c:1110 unix2dos.c:1043 unix2dos.c:1130
+#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr "Ignorando enlace simb�lico %s, el destino no es un archivo regular.\n"
 
-#: dos2unix.c:1033 unix2dos.c:1050
+#: dos2unix.c:1071 unix2dos.c:1084
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr ""
 "Ignorando %s, el destino del enlace simb�lico %s no es un archivo regular.\n"
 
-#: dos2unix.c:1040 dos2unix.c:1117 unix2dos.c:1057 unix2dos.c:1137
+#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "Ignorando archivo binario %s\n"
 
-#: dos2unix.c:1047 dos2unix.c:1124 unix2dos.c:1064 unix2dos.c:1144
+#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "La p�gina de c�digos %d no est� soportada.\n"
 
-#: dos2unix.c:1054 dos2unix.c:1131 unix2dos.c:1071 unix2dos.c:1151
+#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
 "UTF-8.\n"
 msgstr "Ignorando archivo UTF-16 %s, la codificaci�n actual no es UTF-8.\n"
 
-#: dos2unix.c:1061 dos2unix.c:1138 unix2dos.c:1078 unix2dos.c:1158
+#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr "Ignorando archivo UTF-16 %s, el tama�o de wchar_t es %d bytes.\n"
 
-#: dos2unix.c:1068 dos2unix.c:1145 unix2dos.c:1085 unix2dos.c:1165
+#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr ""
 "Ignorando archivo UTF-16 %s, ocurri� un error de conversi�n a UTF-16.\n"
 
-#: dos2unix.c:1074
+#: dos2unix.c:1112
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "convirtiendo archivo %s a %s in formato Unix ...\n"
 
-#: dos2unix.c:1081 unix2dos.c:1101
+#: dos2unix.c:1119 unix2dos.c:1135
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "problemas al convertir el archivo %s a %s\n"
 
-#: dos2unix.c:1103 unix2dos.c:1123
+#: dos2unix.c:1141 unix2dos.c:1157
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Ignorando enlace simb�lico %s.\n"
 
-#: dos2unix.c:1151
+#: dos2unix.c:1189
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "convirtiendo archivo %s a formato Unix ...\n"
 
-#: dos2unix.c:1158 unix2dos.c:1181
+#: dos2unix.c:1196 unix2dos.c:1215
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "problemas convirtiendo el archivo %s\n"
@@ -196,22 +202,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: unix2dos.c:1092
+#: unix2dos.c:1126
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "convirtiendo archivo %s a %s in formato Mac ...\n"
 
-#: unix2dos.c:1094
+#: unix2dos.c:1128
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "convirtiendo archivo %s a %s en formato DOS ...\n"
 
-#: unix2dos.c:1172
+#: unix2dos.c:1206
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "convirtiendo archivo %s a formato Mac ...\n"
 
-#: unix2dos.c:1174
+#: unix2dos.c:1208
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "convirtiendo archivo %s a formato DOS ...\n"
@@ -362,17 +368,23 @@ msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Versi�n Windows de 32 bit (MinGW).\n"
 
 #: common.c:259
-msgid "OS/2 version.\n"
+#, fuzzy
+msgid "OS/2 version (WATCOMC).\n"
+msgstr "Versi�n DOS de 32 bit (WATCOMC).\n"
+
+#: common.c:261
+#, fuzzy
+msgid "OS/2 version (EMX).\n"
 msgstr "Versi�n para OS/2.\n"
 
-#: common.c:262
+#: common.c:264
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Con soporte Unicode UTF-16.\n"
 
-#: common.c:264
+#: common.c:266
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Sin soporte Unicode UTF-16.\n"
 
-#: common.c:267
+#: common.c:269
 msgid "With native language support.\n"
 msgstr "Con soporte de idioma materno.\n"
diff --git a/po/nl.po b/po/nl.po
index 51cf310..dcf5be2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dos2unix 5.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-20 18:54+0200\n"
+"POT-Creation-Date: 2012-08-27 21:28+0200\n"
 "PO-Revision-Date: 2009-12-08 21:59+0100\n"
 "Last-Translator: Erwin Waterlander <waterlan@xs4all.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -27,127 +27,133 @@ msgid ""
 "\n"
 msgstr ""
 
-#: dos2unix.c:169 dos2unix.c:200 dos2unix.c:224 dos2unix.c:323 dos2unix.c:351
-#: dos2unix.c:372 unix2dos.c:152 unix2dos.c:183 unix2dos.c:202 unix2dos.c:219
-#: unix2dos.c:331 unix2dos.c:359 unix2dos.c:375 unix2dos.c:389
+#: dos2unix.c:163 dos2unix.c:200 dos2unix.c:335 dos2unix.c:369 unix2dos.c:131
+#: unix2dos.c:183 unix2dos.c:326 unix2dos.c:375
+#, c-format
+msgid "Binary symbol found at line %d\n"
+msgstr "Binair teken gevonden op regel %d\n"
+
+#: dos2unix.c:177 dos2unix.c:215 dos2unix.c:239 dos2unix.c:347 dos2unix.c:382
+#: dos2unix.c:403 unix2dos.c:160 unix2dos.c:196 unix2dos.c:216 unix2dos.c:233
+#: unix2dos.c:353 unix2dos.c:386 unix2dos.c:403 unix2dos.c:417
 msgid "can not write to output file\n"
 msgstr "kan niet schrijven naar uitvoerbestand\n"
 
-#: dos2unix.c:239 dos2unix.c:386 unix2dos.c:234 unix2dos.c:403
+#: dos2unix.c:255 dos2unix.c:418 unix2dos.c:248 unix2dos.c:431
 #, c-format
 msgid "program error, invalid conversion mode %d\n"
 msgstr "programma fout, ongeldige conversie modus %d\n"
 
-#: dos2unix.c:293 unix2dos.c:288
+#: dos2unix.c:310 unix2dos.c:303
 #, c-format
 msgid "using code page %d.\n"
 msgstr "codetabel %d wordt gebruikt.\n"
 
-#: dos2unix.c:474 unix2dos.c:491
+#: dos2unix.c:506 unix2dos.c:519
 #, c-format
 msgid "Failed to open temporary output file: %s\n"
 msgstr "Niet gelukt om tijdelijk uitvoerbestand te openen: %s\n"
 
-#: dos2unix.c:481 unix2dos.c:498
+#: dos2unix.c:513 unix2dos.c:526
 #, c-format
 msgid "using %s as temporary file\n"
 msgstr "%s wordt als tijdelijk bestand gebruikt\n"
 
-#: dos2unix.c:610 unix2dos.c:627
+#: dos2unix.c:642 unix2dos.c:655
 #, c-format
 msgid "Failed to change the permissions of temporary output file %s: %s\n"
 msgstr ""
 "Niet gelukt om de permissies van tijdelijk uitvoerbestand %s te wijzigen: "
 "%s\n"
 
-#: dos2unix.c:629 unix2dos.c:646
+#: dos2unix.c:661 unix2dos.c:674
 #, c-format
 msgid "Failed to change the owner and group of temporary output file %s: %s\n"
 msgstr ""
 "Niet gelukt om de eigenaar en groep van tijdelijk uitvoerbestand %s te "
 "wijzigen: %s\n"
 
-#: dos2unix.c:682 unix2dos.c:699
+#: dos2unix.c:714 unix2dos.c:727
 #, c-format
 msgid "problems resolving symbolic link '%s'\n"
 msgstr "problemen met het herleiden van symbolische koppeling '%s'\n"
 
-#: dos2unix.c:683 dos2unix.c:717 unix2dos.c:700 unix2dos.c:734
+#: dos2unix.c:715 dos2unix.c:749 unix2dos.c:728 unix2dos.c:762
 #, c-format
 msgid "          output file remains in '%s'\n"
 msgstr "          uitvoerbestand blijft in '%s'\n"
 
-#: dos2unix.c:712 unix2dos.c:729
+#: dos2unix.c:744 unix2dos.c:757
 #, c-format
 msgid "problems renaming '%s' to '%s': %s\n"
 msgstr "problemen met hernoemen van '%s' naar '%s': %s\n"
 
-#: dos2unix.c:715 unix2dos.c:732
+#: dos2unix.c:747 unix2dos.c:760
 #, c-format
 msgid "          which is the target of symbolic link '%s'\n"
 msgstr "          welke het doel is van symbolische koppeling '%s'\n"
 
-#: dos2unix.c:807 unix2dos.c:824
+#: dos2unix.c:839 unix2dos.c:852
 msgid "error: Value of environment variable DOS2UNIX_LOCALEDIR is too long.\n"
 msgstr "fout: Waarde van omgevingsvariabele DOS2UNIX_LOCALEDIR is te lang.\n"
 
-#: dos2unix.c:904 dos2unix.c:935 unix2dos.c:921 unix2dos.c:952
+#: dos2unix.c:942 dos2unix.c:973 unix2dos.c:955 unix2dos.c:986
 #, c-format
 msgid "active code page: %d\n"
 msgstr "actieve code tabel: %d\n"
 
-#: dos2unix.c:945 unix2dos.c:962
+#: dos2unix.c:983 unix2dos.c:996
 #, c-format
 msgid "invalid %s conversion mode specified\n"
 msgstr "ongeldige %s conversie modus gespecificeerd\n"
 
-#: dos2unix.c:955 unix2dos.c:972
+#: dos2unix.c:993 unix2dos.c:1006
 #, c-format
 msgid "option '%s' requires an argument\n"
 msgstr "optie '%s' heeft een argument nodig\n"
 
-#: dos2unix.c:968 dos2unix.c:982 dos2unix.c:1176 unix2dos.c:985 unix2dos.c:999
-#: unix2dos.c:1199
+#: dos2unix.c:1006 dos2unix.c:1020 dos2unix.c:1214 unix2dos.c:1019
+#: unix2dos.c:1033 unix2dos.c:1233
 #, c-format
 msgid "target of file %s not specified in new file mode\n"
 msgstr "doel van bestand %s is niet gespecificeerd in 'nieuw bestand modus'\n"
 
-#: dos2unix.c:1012 dos2unix.c:1096 unix2dos.c:1029 unix2dos.c:1116
+#: dos2unix.c:1050 dos2unix.c:1134 unix2dos.c:1063 unix2dos.c:1150
 #, c-format
 msgid "Skipping %s, not a regular file.\n"
 msgstr "%s wordt overgeslagen, omdat het geen regulier bestand is.\n"
 
-#: dos2unix.c:1019 unix2dos.c:1036
+#: dos2unix.c:1057 unix2dos.c:1070
 #, c-format
 msgid "Skipping %s, output file %s is a symbolic link.\n"
 msgstr ""
 "%s wordt overgeslagen, uitvoerbestand %s is een symbolische koppeling.\n"
 
-#: dos2unix.c:1026 dos2unix.c:1110 unix2dos.c:1043 unix2dos.c:1130
+#: dos2unix.c:1064 dos2unix.c:1148 unix2dos.c:1077 unix2dos.c:1164
 #, c-format
 msgid "Skipping symbolic link %s, target is not a regular file.\n"
 msgstr ""
 "Symbolische koppeling %s wordt overgeslagen, omdat het doel geen regulier "
 "bestand is.\n"
 
-#: dos2unix.c:1033 unix2dos.c:1050
+#: dos2unix.c:1071 unix2dos.c:1084
 #, c-format
 msgid "Skipping %s, target of symbolic link %s is not a regular file.\n"
 msgstr ""
 "%s wordt overgeslagen, omdat het doel van symbolische koppeling %s geen "
 "regulier bestand is.\n"
 
-#: dos2unix.c:1040 dos2unix.c:1117 unix2dos.c:1057 unix2dos.c:1137
+#: dos2unix.c:1078 dos2unix.c:1155 unix2dos.c:1091 unix2dos.c:1171
 #, c-format
 msgid "Skipping binary file %s\n"
 msgstr "Binair bestand %s wordt overgeslagen\n"
 
-#: dos2unix.c:1047 dos2unix.c:1124 unix2dos.c:1064 unix2dos.c:1144
+#: dos2unix.c:1085 dos2unix.c:1162 unix2dos.c:1098 unix2dos.c:1178
 #, c-format
 msgid "code page %d is not supported.\n"
 msgstr "codetabel %d wordt niet ondersteund.\n"
 
-#: dos2unix.c:1054 dos2unix.c:1131 unix2dos.c:1071 unix2dos.c:1151
+#: dos2unix.c:1092 dos2unix.c:1169 unix2dos.c:1105 unix2dos.c:1185
 #, c-format
 msgid ""
 "Skipping UTF-16 file %s, the current locale character encoding is not "
@@ -156,40 +162,40 @@ msgstr ""
 "UTF-16 bestand %s wordt overgeslagen, de huidige lokale karakter codering is "
 "niet UTF-8.\n"
 
-#: dos2unix.c:1061 dos2unix.c:1138 unix2dos.c:1078 unix2dos.c:1158
+#: dos2unix.c:1099 dos2unix.c:1176 unix2dos.c:1112 unix2dos.c:1192
 #, c-format
 msgid "Skipping UTF-16 file %s, the size of wchar_t is %d bytes.\n"
 msgstr ""
 "UTF-16 bestand %s wordt overgeslagen, de grootte van wchar_t is %d bytes.\n"
 
-#: dos2unix.c:1068 dos2unix.c:1145 unix2dos.c:1085 unix2dos.c:1165
+#: dos2unix.c:1106 dos2unix.c:1183 unix2dos.c:1119 unix2dos.c:1199
 #, c-format
 msgid "Skipping UTF-16 file %s, an UTF-16 conversion error occurred.\n"
 msgstr ""
 "UTF-16 bestand %s wordt overgeslagen, een UTF-16 conversie fout is "
 "opgetreden.\n"
 
-#: dos2unix.c:1074
+#: dos2unix.c:1112
 #, c-format
 msgid "converting file %s to file %s in Unix format ...\n"
 msgstr "converteren bestand %s naar bestand %s in Unix formaat ...\n"
 
-#: dos2unix.c:1081 unix2dos.c:1101
+#: dos2unix.c:1119 unix2dos.c:1135
 #, c-format
 msgid "problems converting file %s to file %s\n"
 msgstr "problemen met conversie van bestand %s naar bestand %s\n"
 
-#: dos2unix.c:1103 unix2dos.c:1123
+#: dos2unix.c:1141 unix2dos.c:1157
 #, c-format
 msgid "Skipping symbolic link %s.\n"
 msgstr "Symbolische koppeling %s wordt overgeslagen.\n"
 
-#: dos2unix.c:1151
+#: dos2unix.c:1189
 #, c-format
 msgid "converting file %s to Unix format ...\n"
 msgstr "converteren bestand %s naar Unix formaat ...\n"
 
-#: dos2unix.c:1158 unix2dos.c:1181
+#: dos2unix.c:1196 unix2dos.c:1215
 #, c-format
 msgid "problems converting file %s\n"
 msgstr "problemen met conversie van bestand %s\n"
@@ -202,22 +208,22 @@ msgid ""
 "\n"
 msgstr ""
 
-#: unix2dos.c:1092
+#: unix2dos.c:1126
 #, c-format
 msgid "converting file %s to file %s in Mac format ...\n"
 msgstr "converteren bestand %s naar bestand %s in Mac formaat ...\n"
 
-#: unix2dos.c:1094
+#: unix2dos.c:1128
 #, c-format
 msgid "converting file %s to file %s in DOS format ...\n"
 msgstr "converteren bestand %s naar bestand %s in DOS formaat ...\n"
 
-#: unix2dos.c:1172
+#: unix2dos.c:1206
 #, c-format
 msgid "converting file %s to Mac format ...\n"
 msgstr "converteren bestand %s naar Mac formaat ...\n"
 
-#: unix2dos.c:1174
+#: unix2dos.c:1208
 #, c-format
 msgid "converting file %s to DOS format ...\n"
 msgstr "converteren bestand %s naar DOS formaat ...\n"
@@ -362,17 +368,23 @@ msgid "Windows 32 bit version (MinGW).\n"
 msgstr "Windows 32 bit versie (MinGW).\n"
 
 #: common.c:259
-msgid "OS/2 version.\n"
+#, fuzzy
+msgid "OS/2 version (WATCOMC).\n"
+msgstr "DOS 32 bit versie (WATCOMC).\n"
+
+#: common.c:261
+#, fuzzy
+msgid "OS/2 version (EMX).\n"
 msgstr "OS/2 versie.\n"
 
-#: common.c:262
+#: common.c:264
 msgid "With Unicode UTF-16 support.\n"
 msgstr "Met Unicode UTF-16 ondersteuning.\n"
 
-#: common.c:264
+#: common.c:266
 msgid "Without Unicode UTF-16 support.\n"
 msgstr "Zonder Unicode UTF-16 ondersteuning.\n"
 
-#: common.c:267
+#: common.c:269
 msgid "With native language support.\n"
 msgstr "Met moedertaal ondersteuning.\n"
diff --git a/querycp.c b/querycp.c
index 82bf58c..53b6eb3 100644
--- a/querycp.c
+++ b/querycp.c
@@ -1,10 +1,10 @@
 /* The code in this file is Public Domain */
 
 #if (defined(__WATCOMC__) && defined(__NT__))
-#  define WIN32
+#  define __WIN32__ 1
 #endif
 
-#ifdef DJGPP
+#ifdef __DJGPP__
 
 #include <dpmi.h>
 #include <go32.h>
@@ -145,7 +145,7 @@ unsigned short query_con_codepage(void) {
 }
 
 
-#elif defined (WIN32) && !defined(__CYGWIN__) /* Windows, not Cygwin */
+#elif defined (__WIN32__) && !defined(__CYGWIN__) /* Windows, not Cygwin */
 
 /* Erwin Waterlander */
 
diff --git a/unix2dos.c b/unix2dos.c
index 7088d02..16da1d4 100644
--- a/unix2dos.c
+++ b/unix2dos.c
@@ -7,7 +7,7 @@
  *  The dos2unix package is distributed under FreeBSD style license.
  *  See also http://www.freebsd.org/copyright/freebsd-license.html
  *  --------
- * 
+ *
  *  Copyright (C) 2009-2012 Erwin Waterlander
  *  Copyright (C) 1994-1995 Benjamin Lin.
  *  All rights reserved.
@@ -56,7 +56,7 @@
 #include "unix2dos.h"
 #include "querycp.h"
 #ifdef D2U_UNICODE
-#ifndef MSDOS  /* Unix, Cygwin */
+#if !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__)  /* Unix, Cygwin */
 # include <langinfo.h>
 #endif
 #endif
@@ -104,6 +104,7 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
     int RetVal = 0;
     wint_t TempChar;
     wint_t PreviousChar = 0;
+    int line_nr = 1;
 
     ipFlag->status = 0;
 
@@ -124,15 +125,20 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               (TempChar != 0x0c)) {  /* Not a form feed */
             RetVal = -1;
             ipFlag->status |= BINARY_FILE ;
+            if (!ipFlag->Quiet)
+            {
+              fprintf(stderr, "%s: ", progname);
+              fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+            }
             break;
           }
           if (TempChar == 0x0a)
           {
-            d2u_putwc(0x0d, ipOutF, ipFlag); /* got LF, put CR */
+            d2u_putwc(0x0d, ipOutF, ipFlag); /* got LF, put extra CR */
           } else {
              if (TempChar == 0x0d) /* got CR */
              {
-               if ((TempChar = d2u_getwc(ipInF, ipFlag->bomtype)) == WEOF) /* get next char */
+               if ((TempChar = d2u_getwc(ipInF, ipFlag->bomtype)) == WEOF) /* get next char (possibly LF) */
                  TempChar = 0x0d;  /* Read error, or end of file. */
                else
                {
@@ -141,6 +147,8 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                }
              }
           }
+          if (TempChar == 0x0a) /* Count all DOS and Unix line breaks */
+            ++line_nr;
           if (d2u_putwc(TempChar, ipOutF, ipFlag) == WEOF)
           {
               RetVal = -1;
@@ -169,6 +177,11 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               (TempChar != 0x0c)) {  /* Not a form feed */
             RetVal = -1;
             ipFlag->status |= BINARY_FILE ;
+            if (!ipFlag->Quiet)
+            {
+              fprintf(stderr, "%s: ", progname);
+              fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+            }
             break;
           }
           if ((TempChar != 0x0a)) /* Not an LF */
@@ -189,6 +202,7 @@ int ConvertUnixToDosW(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
             }
           else{
             /* TempChar is an LF */
+            ++line_nr;
             /* Don't touch this delimiter if it's a CR,LF pair. */
             if ( PreviousChar == 0x0d ) {
               if (d2u_putwc(0x0a, ipOutF, ipFlag) == WEOF)  /* CR,LF pair. Put LF */
@@ -249,6 +263,7 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
     int TempChar;
     int PreviousChar = 0;
     int *ConvTable;
+    int line_nr = 1;
 
     ipFlag->status = 0;
 
@@ -305,15 +320,20 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               (TempChar != '\x0c')) {  /* Not a form feed */
             RetVal = -1;
             ipFlag->status |= BINARY_FILE ;
+            if (!ipFlag->Quiet)
+            {
+              fprintf(stderr, "%s: ", progname);
+              fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+            }
             break;
           }
           if (TempChar == '\x0a')
           {
-            fputc('\x0d', ipOutF); /* got LF, put CR */
+            fputc('\x0d', ipOutF); /* got LF, put extra CR */
           } else {
              if (TempChar == '\x0d') /* got CR */
              {
-               if ((TempChar = fgetc(ipInF)) == EOF) /* get next char */
+               if ((TempChar = fgetc(ipInF)) == EOF) /* get next char (possibly LF) */
                  TempChar = '\x0d';  /* Read error, or end of file. */
                else
                {
@@ -322,7 +342,9 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
                }
              }
           }
-          if (fputc(ConvTable[TempChar], ipOutF) == EOF)
+          if (TempChar == '\x0a') /* Count all DOS and Unix line breaks */
+            ++line_nr;
+          if (fputc(ConvTable[TempChar], ipOutF) == EOF) /* put LF or other char */
           {
               RetVal = -1;
               if (!ipFlag->Quiet)
@@ -347,6 +369,11 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
               (TempChar != '\x0c')) {  /* Not a form feed */
             RetVal = -1;
             ipFlag->status |= BINARY_FILE ;
+            if (!ipFlag->Quiet)
+            {
+              fprintf(stderr, "%s: ", progname);
+              fprintf(stderr, _("Binary symbol found at line %d\n"), line_nr);
+            }
             break;
           }
           if ((TempChar != '\x0a')) /* Not an LF */
@@ -364,6 +391,7 @@ int ConvertUnixToDos(FILE* ipInF, FILE* ipOutF, CFlag *ipFlag, char *progname)
             }
           else{
             /* TempChar is an LF */
+            ++line_nr;
             /* Don't touch this delimiter if it's a CR,LF pair. */
             if ( PreviousChar == '\x0d' ) {
               if (fputc('\x0a', ipOutF) == EOF)  /* CR,LF pair. Put LF */
@@ -477,7 +505,7 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     }
     RetVal = -1;
   }
-  
+
 #ifdef NO_MKSTEMP
   if((fd = MakeTempFileFrom(ipOutFN, &TempPath))==NULL) {
 #else
@@ -533,7 +561,7 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
   InF = read_bom(InF, &ipFlag->bomtype);
 
 #ifdef D2U_UNICODE
-#ifndef MSDOS  /* Unix, Cygwin */
+#if !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__)  /* Unix, Cygwin */
   if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))
   {
     if (strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
@@ -546,7 +574,7 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     }
   }
 #endif
-#if !defined(WIN32) && !defined(__CYGWIN__) /* Not Windows or Cygwin */
+#if !defined(__WIN32__) && !defined(__CYGWIN__) /* Not Windows or Cygwin */
   if ((ipFlag->bomtype == FILE_UTF16LE) || (ipFlag->bomtype == FILE_UTF16BE))
   {
     if (sizeof(wchar_t) < 4)
@@ -609,14 +637,14 @@ int ConvertUnixToDosNewFile(char *ipInFN, char *ipOutFN, CFlag *ipFlag, char *pr
     if (ipFlag->NewFile == 0) /* old file mode */
     {
        RetVal = chmod (TempPath, StatBuf.st_mode); /* set original permissions */
-    } 
+    }
     else
     {
        mask = umask(0); /* get process's umask */
        umask(mask); /* set umask back to original */
        RetVal = chmod(TempPath, StatBuf.st_mode & ~mask); /* set original permissions, minus umask */
     }
-    
+
     if (RetVal)
     {
        if (!ipFlag->Quiet)
@@ -754,7 +782,7 @@ int ConvertUnixToDosStdio(CFlag *ipFlag, char *progname)
     ipFlag->KeepDate = 0;
     ipFlag->Force = 1;
 
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(__WIN32__) && !defined(__CYGWIN__)
 
     /* stdin and stdout are by default text streams. We need
      * to set them to binary mode. Otherwise an LF will
@@ -766,7 +794,7 @@ int ConvertUnixToDosStdio(CFlag *ipFlag, char *progname)
 
     _setmode(fileno(stdout), O_BINARY);
     _setmode(fileno(stdin), O_BINARY);
-#elif defined(MSDOS) || defined(__CYGWIN__) || defined(__OS2__)
+#elif defined(__MSDOS__) || defined(__CYGWIN__) || defined(__OS2__)
     setmode(fileno(stdout), O_BINARY);
     setmode(fileno(stdin), O_BINARY);
 #endif
@@ -825,8 +853,14 @@ int main (int argc, char *argv[])
          strcpy(localedir,LOCALEDIR);
       }
    }
+#endif
 
+#if defined(ENABLE_NLS) || (defined(D2U_UNICODE) && !defined(__MSDOS__) && !defined(__WIN32__) && !defined(__OS2__))
+/* setlocale() is also needed for nl_langinfo() */
    setlocale (LC_ALL, "");
+#endif
+
+#ifdef ENABLE_NLS
    bindtextdomain (PACKAGE, localedir);
    textdomain (PACKAGE);
 #endif
@@ -836,7 +870,7 @@ int main (int argc, char *argv[])
   ArgIdx = 0;
   CanSwitchFileMode = 1;
   ShouldExit = 0;
-  pFlag = (CFlag*)malloc(sizeof(CFlag));  
+  pFlag = (CFlag*)malloc(sizeof(CFlag));
   pFlag->NewFile = 0;
   pFlag->Quiet = 0;
   pFlag->KeepDate = 0;
diff --git a/version.mk b/version.mk
index 1c8a867..2fa12fb 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
-DOS2UNIX_VERSION = 6.0.1
-DOS2UNIX_VERSION_SHORT = 601
-DOS2UNIX_DATE = 2012-07-25
+DOS2UNIX_VERSION = 6.0.2
+DOS2UNIX_VERSION_SHORT = 602
+DOS2UNIX_DATE = 2012-09-06
 DOS2UNIX_AUTHOR = 'Erwin Waterlander'
diff --git a/wcc.mif b/wcc.mif
new file mode 100755
index 0000000..b6111e6
--- /dev/null
+++ b/wcc.mif
@@ -0,0 +1,156 @@
+!ifeq UCS 1
+CFLAGS += -DD2U_UNICODE
+!endif
+
+dos2unix.obj :  $(SRCDIR)\dos2unix.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h
+	$(CC) $(CFLAGS) $(SRCDIR)\dos2unix.c
+
+unix2dos.obj :  $(SRCDIR)\unix2dos.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h
+	$(CC) $(CFLAGS) $(SRCDIR)\unix2dos.c
+
+querycp.obj :  $(SRCDIR)\querycp.c $(SRCDIR)\querycp.h
+	$(CC) $(CFLAGS) $(SRCDIR)\querycp.c
+
+common.obj :  $(SRCDIR)\common.c $(SRCDIR)\common.h
+	$(CC) $(CFLAGS) $(SRCDIR)\common.c
+
+wildargv.obj : $(WATCOMSRC)\wildargv.c
+	$(CC) $(CFLAGS) $(WATCOMSRC)\wildargv.c
+
+mac2unix.exe : dos2unix.exe
+	copy /v dos2unix.exe mac2unix.exe
+
+unix2mac.exe : unix2dos.exe
+	copy /v unix2dos.exe unix2mac.exe
+
+
+exec_prefix = $(prefix)
+bindir      = $(exec_prefix)\bin
+datarootdir = $(prefix)\share
+datadir     = $(datarootdir)
+!ifndef docsubdir
+docsubdir   = $(PACKAGE)-$(DOS2UNIX_VERSION)
+!endif
+docdir      = $(datarootdir)\doc\$(docsubdir)
+INSTALL_OBJS_DOC = README.txt NEWS.txt ChangeLog.txt COPYING.txt TODO.txt BUGS.txt $(DOCFILES)
+
+
+$(prefix): .EXISTSONLY
+	mkdir $@
+
+$(bindir): $(prefix) .EXISTSONLY
+	mkdir $@
+
+$(datarootdir): $(prefix) .EXISTSONLY
+	mkdir $@
+
+$(datarootdir)\doc: $(datarootdir) .EXISTSONLY
+	mkdir $@
+
+$(docdir): $(datarootdir)\doc .EXISTSONLY
+	mkdir $@
+
+install: $(PROGRAMS) $(DOCFILES) $(bindir) $(docdir) .SYMBOLIC
+	copy dos2unix.exe $(bindir)
+	copy mac2unix.exe $(bindir)
+	copy unix2dos.exe $(bindir)
+	copy unix2mac.exe $(bindir)
+	copy README.txt $(docdir)
+	copy NEWS.txt $(docdir)
+	copy ChangeLog.txt $(docdir)
+	copy COPYING.txt $(docdir)
+	copy TODO.txt $(docdir)
+	copy BUGS.txt $(docdir)
+	copy man\man1\dos2unix.txt $(docdir)
+	copy man\man1\dos2unix.$(HTMLEXT) $(docdir)
+
+man\es\man1\dos2unix.txt : man\es\man1\dos2unix.pod
+	pod2text $< > $^*.tx1
+	iconv -f ISO-8859-1 -t UTF-8 $^*.tx1 > $@
+
+man\nl\man1\dos2unix.txt : man\nl\man1\dos2unix.pod
+	pod2text $< > $^*.tx1
+	iconv -f ISO-8859-1 -t UTF-8 $^*.tx1 > $@
+
+man\man1\dos2unix.txt : man\man1\dos2unix.pod
+	pod2text $< > $@
+
+man\es\man1\dos2unix.$(HTMLEXT) : man\es\man1\dos2unix.pod
+	iconv -f ISO-8859-1 -t UTF-8 $< > $^*.ut8
+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - Convertidor de archivos de texto de formato DOS/Mac a Unix y viceversa" $^*.ut8 > $@
+
+man\nl\man1\dos2unix.$(HTMLEXT) : man\nl\man1\dos2unix.pod
+	iconv -f ISO-8859-1 -t UTF-8 $< > $^*.ut8
+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/Mac naar Unix en vice versa tekstbestand formaat omzetter" $^*.ut8 > $@
+
+man\man1\dos2unix.$(HTMLEXT) : man\man1\dos2unix.pod
+	pod2html --title="$(PACKAGE) $(DOS2UNIX_VERSION) - DOS/MAC to UNIX and vice versa text file format converter" $< > $@
+
+TXTFILES = man\man1\$(PACKAGE).txt man\es\man1\$(PACKAGE).txt man\nl\man1\$(PACKAGE).txt
+HTMLFILES = man\man1\$(PACKAGE).$(HTMLEXT) man\es\man1\$(PACKAGE).$(HTMLEXT) man\nl\man1\$(PACKAGE).$(HTMLEXT)
+
+txt : $(TXTFILES) .SYMBOLIC
+
+html : $(HTMLFILES) .SYMBOLIC
+
+doc : $(DOCFILES) .SYMBOLIC
+
+uninstall: .SYMBOLIC
+	-del $(bindir)\dos2unix.exe
+	-del $(bindir)\mac2unix.exe
+	-del $(bindir)\unix2dos.exe
+	-del $(bindir)\unix2mac.exe
+	-rmdir /s /q $(docdir)
+
+!ifndef VERSIONSUFFIX
+VERSIONSUFFIX	= -bin
+!endif
+
+!ifndef ZIPFILE
+ZIPFILE = $(PACKAGE)$(DOS2UNIX_VERSION)$(VERSIONSUFFIX).zip
+!endif
+ZIPOBJ = bin\dos2unix.exe bin\mac2unix.exe bin\unix2dos.exe bin\unix2mac.exe share\doc\$(docsubdir) $(ZIPOBJ_EXTRA)
+
+CURDISK = $+ $(%cdrive): $-
+CURDIR = $+ $(%cwd) $-
+
+!ifdef __OS2__
+DISTCMD = dist.cmd
+!else
+DISTCMD = dist.bat
+!endif
+
+dist : .SYMBOLIC
+	@%create $(DISTCMD)
+	@%append $(DISTCMD) set PREFIX=$(prefix)
+	@%append $(DISTCMD) set PREFIXDISK=%PREFIX:~0,2%
+	@%append $(DISTCMD) %PREFIXDISK%
+	@%append $(DISTCMD) cd $(prefix)
+	@%append $(DISTCMD) unix2dos -k share\doc\$(docsubdir)\*.txt
+	@%append $(DISTCMD) unix2dos -k share\doc\$(docsubdir)\*.$(HTMLEXT)
+	@%append $(DISTCMD) zip -r $(ZIPFILE) $(ZIPOBJ)
+	@%append $(DISTCMD) $(CURDISK)
+	@%append $(DISTCMD) cd $(CURDIR)
+	@%append $(DISTCMD) move $(prefix)\$(ZIPFILE) ..
+	.\$(DISTCMD)
+
+
+mostlyclean : .SYMBOLIC
+	-del *.obj
+	-del *.exe
+	-del *.SYM
+	-del *.map
+	-del *.ilk
+	-del *.tmp
+
+clean : mostlyclean .SYMBOLIC
+	-del $(DOCFILES)
+	-del man\es\man1\*.txt
+	-del man\nl\man1\*.txt
+	-del man\es\man1\*.tx1
+	-del man\nl\man1\*.tx1
+	-del man\es\man1\*.$(HTMLEXT)
+	-del man\nl\man1\*.$(HTMLEXT)
+	-del man\es\man1\*.ut8
+	-del man\nl\man1\*.ut8
+
diff --git a/wccdos16.mak b/wccdos16.mak
index 8f64e36..2fa1f28 100644
--- a/wccdos16.mak
+++ b/wccdos16.mak
@@ -2,17 +2,22 @@
 
 CC      = wcc
 SRCDIR = .
-DEFINES = -DMSDOS -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)"
+DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)"
 CFLAGS  = $(DEFINES) -i=$(SRCDIR) -w4 -e25 -zq -od -d2 -bt=dos -ml
 WATCOMSRC = $(%WATCOM)\src\startup
+PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe
+HTMLEXT = htm
+PACKAGE = dos2unix
+DOCFILES = man\man1\$(PACKAGE).txt man\man1\$(PACKAGE).$(HTMLEXT)
+VERSIONSUFFIX = b
+ZIPFILE = d2u$(DOS2UNIX_VERSION_SHORT)$(VERSIONSUFFIX).zip
+docsubdir = dos2unix
 
-TARGET = dos
+prefix = c:\dos
 
-all: dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe
+TARGET = dos
 
-cflags.cfg:
-	@%create cflags.cfg
-	@%append cflags.cfg $(CFLAGS)
+all: $(PROGRAMS) $(DOCFILES) .SYMBOLIC
 
 dos2unix.exe: dos2unix.obj querycp.obj common.obj wildargv.obj
 	@%create dos2unix.lnk
@@ -26,38 +31,5 @@ unix2dos.exe: unix2dos.obj querycp.obj common.obj wildargv.obj
 	wlink name unix2dos d all SYS $(TARGET) op m op st=32k op maxe=25 op q op symf @unix2dos.lnk
 	del unix2dos.lnk
 
+!include wcc.mif
 
-dos2unix.obj :  $(SRCDIR)\dos2unix.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h cflags.cfg
-	$(CC) @cflags.cfg $(SRCDIR)\dos2unix.c
-
-unix2dos.obj :  $(SRCDIR)\unix2dos.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h cflags.cfg
-	$(CC) @cflags.cfg $(SRCDIR)\unix2dos.c
-
-querycp.obj :  $(SRCDIR)\querycp.c $(SRCDIR)\querycp.h cflags.cfg
-	$(CC) @cflags.cfg $(SRCDIR)\querycp.c
-
-common.obj :  $(SRCDIR)\common.c $(SRCDIR)\common.h cflags.cfg
-	$(CC) @cflags.cfg $(SRCDIR)\common.c
-
-wildargv.obj : $(WATCOMSRC)\wildargv.c
-	$(CC) @cflags.cfg $(WATCOMSRC)\wildargv.c
-
-mac2unix.exe : dos2unix.exe
-	copy /v dos2unix.exe mac2unix.exe
-
-unix2mac.exe : unix2dos.exe
-	copy /v unix2dos.exe unix2mac.exe
-
-strip
-	wstrip dos2unix.exe
-	wstrip unix2dos.exe
-	wstrip mac2unix.exe
-	wstrip unix2mac.exe
-
-clean
-	-del *.obj
-	-del *.exe
-	-del *.SYM
-	-del *.map
-	-del *.ilk
-	-del cflags.cfg
diff --git a/wccdos32.mak b/wccdos32.mak
index a8fb6bd..5deaa07 100644
--- a/wccdos32.mak
+++ b/wccdos32.mak
@@ -5,14 +5,20 @@ SRCDIR = .
 DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)"
 CFLAGS  = $(DEFINES) -i=$(SRCDIR) -w4 -e25 -zq -od -d2 -5r -bt=dos -mf
 WATCOMSRC = $(%WATCOM)\src\startup
+PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe
+HTMLEXT = htm
+PACKAGE = dos2unix
+DOCFILES = man\man1\$(PACKAGE).txt man\man1\$(PACKAGE).$(HTMLEXT)
+VERSIONSUFFIX = pm
+ZIPFILE = d2u$(DOS2UNIX_VERSION_SHORT)$(VERSIONSUFFIX).zip
+ZIPOBJ_EXTRA = bin\cwstub.exe
+docsubdir = dos2unix
 
-TARGET = causeway
+prefix = c:\dos32
 
-all: dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe
+TARGET = causeway
 
-cflagsDS.cfg:
-	@%create cflagsDS.cfg
-	@%append cflagsDS.cfg $(CFLAGS)
+all: $(PROGRAMS) $(DOCFILES) .SYMBOLIC
 
 dos2unix.exe: dos2unix.obj querycp.obj common.obj wildargv.obj
 	@%create dos2unix.lnk
@@ -26,38 +32,5 @@ unix2dos.exe: unix2dos.obj querycp.obj common.obj wildargv.obj
 	wlink name unix2dos d all SYS $(TARGET) op inc op m op st=64k op maxe=25 op q op symf @unix2dos.lnk
 	del unix2dos.lnk
 
+!include wcc.mif
 
-dos2unix.obj :  $(SRCDIR)\dos2unix.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h cflagsDS.cfg
-	$(CC) @cflagsDS.cfg $(SRCDIR)\dos2unix.c
-
-unix2dos.obj :  $(SRCDIR)\unix2dos.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h cflagsDS.cfg
-	$(CC) @cflagsDS.cfg $(SRCDIR)\unix2dos.c
-
-querycp.obj :  $(SRCDIR)\querycp.c $(SRCDIR)\querycp.h cflagsDS.cfg
-	$(CC) @cflagsDS.cfg $(SRCDIR)\querycp.c
-
-common.obj :  $(SRCDIR)\common.c $(SRCDIR)\common.h cflagsDS.cfg
-	$(CC) @cflagsDS.cfg $(SRCDIR)\common.c
-
-wildargv.obj : $(WATCOMSRC)\wildargv.c
-	$(CC) @cflagsDS.cfg $(WATCOMSRC)\wildargv.c
-
-mac2unix.exe : dos2unix.exe
-	copy /v dos2unix.exe mac2unix.exe
-
-unix2mac.exe : unix2dos.exe
-	copy /v unix2dos.exe unix2mac.exe
-
-strip
-	wstrip dos2unix.exe
-	wstrip unix2dos.exe
-	wstrip mac2unix.exe
-	wstrip unix2mac.exe
-
-clean
-	-del *.obj
-	-del *.exe
-	-del *.SYM
-	-del *.map
-	-del *.ilk 
-	-del cflagsDS.cfg
diff --git a/wccos2.mak b/wccos2.mak
new file mode 100644
index 0000000..901398a
--- /dev/null
+++ b/wccos2.mak
@@ -0,0 +1,33 @@
+!include version.mk
+
+CC      = wcc386
+SRCDIR = .
+DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)"
+CFLAGS  = $(DEFINES) -i=$(SRCDIR) -i$(%WATCOM)\h\os2 -w4 -e25 -zq -od -d2 -6r -bt=os2 -mf
+WATCOMSRC = $(%WATCOM)\src\startup
+PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe
+HTMLEXT = htm
+PACKAGE = dos2unix
+DOCFILES = man\man1\$(PACKAGE).txt man\man1\$(PACKAGE).$(HTMLEXT)
+VERSIONSUFFIX = -os2
+
+prefix = c:\usr
+
+TARGET = os2v2
+
+all: $(PROGRAMS) $(DOCFILES) .SYMBOLIC
+
+dos2unix.exe: dos2unix.obj querycp.obj common.obj wildargv.obj
+	@%create dos2unix.lnk
+	@%append dos2unix.lnk FIL dos2unix.obj,querycp.obj,common.obj,wildargv.obj
+	wlink name dos2unix d all SYS $(TARGET) op inc op m op st=64k op maxe=25 op q op symf @dos2unix.lnk
+	del dos2unix.lnk
+
+unix2dos.exe: unix2dos.obj querycp.obj common.obj wildargv.obj
+	@%create unix2dos.lnk
+	@%append unix2dos.lnk FIL unix2dos.obj,querycp.obj,common.obj,wildargv.obj
+	wlink name unix2dos d all SYS $(TARGET) op inc op m op st=64k op maxe=25 op q op symf @unix2dos.lnk
+	del unix2dos.lnk
+
+!include wcc.mif
+
diff --git a/wccwin32.mak b/wccwin32.mak
index 2e035d3..9dcc423 100644
--- a/wccwin32.mak
+++ b/wccwin32.mak
@@ -2,17 +2,21 @@
 
 CC      = wcc386
 SRCDIR = .
-DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)" -DD2U_UNICODE
+DEFINES = -DVER_REVISION="$(DOS2UNIX_VERSION)" -DVER_DATE="$(DOS2UNIX_DATE)"
 CFLAGS  = $(DEFINES) -i=$(SRCDIR) -w4 -e25 -zq -od -d2 -5r -bt=nt -mf
 WATCOMSRC = $(%WATCOM)\src\startup
+PROGRAMS = dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe
+HTMLEXT = htm
+PACKAGE = dos2unix
+DOCFILES = man\man1\$(PACKAGE).txt man\man1\$(PACKAGE).$(HTMLEXT)
+VERSIONSUFFIX = -win32
+UCS = 1
 
-TARGET = nt
+prefix = c:\usr\local
 
-all: dos2unix.exe unix2dos.exe mac2unix.exe unix2mac.exe
+TARGET = nt
 
-cflags32.cfg:
-	@%create cflags32.cfg
-	@%append cflags32.cfg $(CFLAGS)
+all: $(PROGRAMS) $(DOCFILES) .SYMBOLIC
 
 dos2unix.exe: dos2unix.obj querycp.obj common.obj wildargv.obj
 	@%create dos2unix.lnk
@@ -28,38 +32,5 @@ unix2dos.exe: unix2dos.obj querycp.obj common.obj wildargv.obj
 	wlink name unix2dos d all SYS $(TARGET) op inc op m op st=64k op maxe=25 op q op symf @unix2dos.lnk
 	del unix2dos.lnk
 
+!include wcc.mif
 
-dos2unix.obj :  $(SRCDIR)\dos2unix.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h cflags32.cfg
-	$(CC) @cflags32.cfg $(SRCDIR)\dos2unix.c
-
-unix2dos.obj :  $(SRCDIR)\unix2dos.c $(SRCDIR)\querycp.h $(SRCDIR)\common.h cflags32.cfg
-	$(CC) @cflags32.cfg $(SRCDIR)\unix2dos.c
-
-querycp.obj :  $(SRCDIR)\querycp.c $(SRCDIR)\querycp.h cflags32.cfg
-	$(CC) @cflags32.cfg $(SRCDIR)\querycp.c
-
-common.obj :  $(SRCDIR)\common.c $(SRCDIR)\common.h cflags32.cfg
-	$(CC) @cflags32.cfg $(SRCDIR)\common.c
-
-wildargv.obj : $(WATCOMSRC)\wildargv.c
-	$(CC) @cflags32.cfg $(WATCOMSRC)\wildargv.c
-
-mac2unix.exe : dos2unix.exe
-	copy /v dos2unix.exe mac2unix.exe
-
-unix2mac.exe : unix2dos.exe
-	copy /v unix2dos.exe unix2mac.exe
-
-strip
-	wstrip dos2unix.exe
-	wstrip unix2dos.exe
-	wstrip mac2unix.exe
-	wstrip unix2mac.exe
-
-clean
-	-del *.obj
-	-del *.exe
-	-del *.SYM
-	-del *.map
-	-del *.ilk 
-	-del cflags32.cfg
author	DongHun Kwak <dh0128.kwak@samsung.com>	2016-10-20 10:34:45 +0900
committer	DongHun Kwak <dh0128.kwak@samsung.com>	2016-10-20 10:34:48 +0900
commit	bffd2540485d9fa5b17c38cac8f5c4ed376c442d (patch)
tree	5ad5fd03f3cf8a3ae4999cd404d9fc1194646378
parent	92129cc3165be4ab9f5b37e8969896201ec9033f (diff)
download	dos2unix-bffd2540485d9fa5b17c38cac8f5c4ed376c442d.tar.gz dos2unix-bffd2540485d9fa5b17c38cac8f5c4ed376c442d.tar.bz2 dos2unix-bffd2540485d9fa5b17c38cac8f5c4ed376c442d.zip