diff --git a/LICENSE b/LICENSE
index 47750ea..8ab7837 100644
--- a/LICENSE
+++ b/LICENSE
@@ -114,27 +114,24 @@ Wrapper license
 -------------------------------------------------------------------------------
 The wrapper is licensed to you under the following terms:
 
-Copyright (c) Andreas Kloeckner
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. None of the authors' names may be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2004-2008 Andreas Kloeckner
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/setup.py b/setup.py
index 7b45987..d714db7 100644
--- a/setup.py
+++ b/setup.py
@@ -43,11 +43,45 @@ def main():
     execfile("src/python/__init__.py", conf)
     setup(name="MeshPy",
           version=conf["version"],
-          description="A wrapper around the TetGen and Triangle",
+          description="Triangular and Tetrahedral Mesh Generator",
+          long_description="""
+          MeshPy offers quality triangular and tetrahedral mesh
+          generation for Python. Meshes of this type are chiefly used
+          in finite-element simulation codes, but also have many
+          other applications ranging from computer graphics to
+          robotics.
+
+          In order to generate 2D and 3D meshes, MeshPy provides
+          Python interfaces to two well-regarded mesh generators,
+          `Triangle <http://www.cs.cmu.edu/~quake/triangle.html>`_ by
+          J.  Shewchuk and `TetGen <http://tetgen.berlios.de/>`_ by
+          Hang Si. Both are included in the package in slightly
+          modified versions.
+
+          MeshPy uses `Boost.Python <http://www.boost.org>`_. 
+          """,
           author="Andreas Kloeckner",
           author_email="inform@tiker.net",
-          license = "BSD for the wrapper/non-commercial MIT for the meshers",
-          url="http://news.tiker.net/software/meshpy",
+          license = "MIT for the wrapper/non-commercial MIT for the meshers",
+          url="http://mathema.tician.de/software/meshpy",
+          classifiers=[
+            'Development Status :: 4 - Beta',
+            'Intended Audience :: Developers',
+            'Intended Audience :: Other Audience',
+            'Intended Audience :: Science/Research',
+            'License :: OSI Approved :: MIT License',
+            'License :: Free for non-commercial use',
+            'Natural Language :: English',
+            'Programming Language :: C++',
+            'Programming Language :: Python',
+            'Topic :: Multimedia :: Graphics :: 3D Modeling',
+            'Topic :: Scientific/Engineering',
+            'Topic :: Scientific/Engineering :: Mathematics',
+            'Topic :: Scientific/Engineering :: Physics',
+            'Topic :: Scientific/Engineering :: Visualization',
+            'Topic :: Software Development :: Libraries',
+            ],
+
           packages = [ "meshpy" ],
           package_dir={"meshpy": "src/python"},
           ext_modules = [