diff --git a/configure.ac b/configure.ac
index ce4b9b9..3ae8ccd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,7 @@ if test "$with_python" != "no"; then
 	AM_PATH_PYTHON([2.4])
 	m4_include([m4/m4_ax_python_devel.m4])
 	AX_PYTHON_DEVEL([>= '2.4'])
-	AC_CONFIG_FILES([python/Makefile] [python/setup.py])
+	AC_CONFIG_FILES([python/Makefile])
 fi
 if test "$Python" == "missing"; then
 	echo "Could not find a suitable Python program. Disabling building python support..."
diff --git a/docs/Doxyfile_library.in b/docs/Doxyfile_library.in
index 0cfdd4a..9e09d93 100644
--- a/docs/Doxyfile_library.in
+++ b/docs/Doxyfile_library.in
@@ -459,7 +459,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = @top_srcdir@/include/
+INPUT                  = @top_srcdir@/include/ @top_srcdir@/python/libcvautomation_funcs.py
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -480,7 +480,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = 
+EXCLUDE                =
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
diff --git a/python/libcvautomation_funcs.py b/python/libcvautomation_funcs.py
new file mode 100644
index 0000000..a8d9ddb
--- /dev/null
+++ b/python/libcvautomation_funcs.py
@@ -0,0 +1,4 @@
+## \file libcvautomation_funcs.py
+# \brief Libcvautomation wrapper for python
+# \details This source file is designed to give high-level access to libcvautomation using Python. It was modeled after the Bash wrapper, but allows for access to all the extra features of Python.
+# \author Bradlee Speice
diff --git a/python/setup.py.in b/python/setup.py.in
deleted file mode 100644
index 9147cdf..0000000
--- a/python/setup.py.in
+++ /dev/null
@@ -1,5 +0,0 @@
-from distutils.core import setup
-setup(name='@PACKAGE_NAME@',
-		version='@PACKAGE_VERSION@',
-		py_modules=['@PACKAGE_NAME@'],
-		)