diff --git a/common/makefile b/common/makefile
index eeb39d0..4efd80e 100644
--- a/common/makefile
+++ b/common/makefile
@@ -59,10 +59,18 @@
 # Document Production
 ###
 
-2HTML    = rst2html__PY__
-2LATEX   = rst2latex__PY__ --stylesheet=parskip
-2ODT     = rst2odt__PY__
-2MAN     = rst2man__PY__
+# Some Docutils installations keep the ".py" suffix for the various
+# frontend programs, and some do not.  It's even possible there are
+# links from one to the other.  Since the project can be checked out
+# on any platform, we have to check for this every time we run the
+# 'make'.  This is irritating.
+
+2HTML    = $(shell which rst2html.py  rst2html  | tr '\012' ' ' | awk '{print $1}')
+2LATEX   = $(shell which rst2latex.py rst2latex | tr '\012' ' ' | awk '{print $1}')  --stylesheet=parskip
+2ODT     = $(shell which rst2odt.py   rst2odt   | tr '\012' ' ' | awk '{print $1}')
+2MAN     = $(shell which rst2man.py   rst2man   | tr '\012' ' ' | awk '{print $1}')
+
+# TeX/LaTeX Processing
 
 DVIPS    = dvips
 PDFLATEX = pdflatex
diff --git a/makefile b/makefile
index 1b118ff..bc257bb 100644
--- a/makefile
+++ b/makefile
@@ -6,9 +6,9 @@
 #
 # For Program Updates See: http://www.tundraware.com/Software/tmkproject
 #
-# $Id: makefile,v 1.108 2012/06/06 01:57:59 tundra Exp $
+# $Id: makefile,v 1.109 2012/06/06 17:37:44 tundra Exp $
 
-CVSID='$Id: makefile,v 1.108 2012/06/06 01:57:59 tundra Exp $'
+CVSID='$Id: makefile,v 1.109 2012/06/06 17:37:44 tundra Exp $'
 
 # Uncomment One Of The Following For Early Releases
 
@@ -62,10 +62,18 @@
 # Document Production
 ###
 
-2HTML    = rst2html
-2LATEX   = rst2latex --stylesheet=parskip
-2ODT     = rst2odt
-2MAN     = rst2man
+# Some Docutils installations keep the ".py" suffix for the various
+# frontend programs, and some do not.  It's even possible there are
+# links from one to the other.  Since the project can be checked out
+# on any platform, we have to check for this every time we run the
+# 'make'.  This is irritating.
+
+2HTML    = $(shell which rst2html.py  rst2html  | tr '\012' ' ' | awk '{print $1}')
+2LATEX   = $(shell which rst2latex.py rst2latex | tr '\012' ' ' | awk '{print $1}')  --stylesheet=parskip
+2ODT     = $(shell which rst2odt.py   rst2odt   | tr '\012' ' ' | awk '{print $1}')
+2MAN     = $(shell which rst2man.py   rst2man   | tr '\012' ' ' | awk '{print $1}')
+
+# TeX/LaTeX Processing
 
 DVIPS    = dvips
 PDFLATEX = pdflatex
diff --git a/tmkproject.sh b/tmkproject.sh
index 26f0f6c..5198d79 100755
--- a/tmkproject.sh
+++ b/tmkproject.sh
@@ -3,9 +3,9 @@
 #
 # Copyright (c) 2012, TundraWare Inc., Des Plaines, IL 60018 USA
 # All Rights Reserved. For Terms Of Use, See: tmkproject-license.txt
-# $Id: tmkproject.sh,v 1.110 2012/06/06 02:35:19 tundra Exp $
+# $Id: tmkproject.sh,v 1.111 2012/06/06 17:37:44 tundra Exp $
 
-CVSID='$Id: tmkproject.sh,v 1.110 2012/06/06 02:35:19 tundra Exp $'
+CVSID='$Id: tmkproject.sh,v 1.111 2012/06/06 17:37:44 tundra Exp $'
 
 
 # If user just wants program version, display it and exit.
@@ -96,15 +96,6 @@
 RESERVED="All Rights Reserved. For Terms Of Use See: ${LICENSE}"
 UPDATES="For Program Updates See: ${WEBSITE}"
 
-# Find out whether the Restructured Text tools have an
-# extension of ".py".  Some installations do, some don't.
-
-PY=".py"
-if [ -z `which rst2latex${PY}` ]
-then
-  PY=""
-fi
-
 # Make relevant directories and go to the working directory
 
 RELEASES="Releases"
diff --git a/tokens b/tokens
index 0b1a740..6ca3c6b 100644
--- a/tokens
+++ b/tokens
@@ -10,7 +10,6 @@
 __LANGUAGE__              "${LANGUAGE}"
 __LICENSE__               "${LICENSE}"
 __PROJECTNAME__           "${PROJECTNAME}"
-__PY__                    "${PY}"
 __RESERVED__              "${RESERVED}"
 __TYPE__                  "${TYPE}"
 __UPDATES__               "${UPDATES}"