diff --git a/Makefile b/Makefile
index b6a6692..c0c53f2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,7 @@
 TEST = mininet/test/*.py
 EXAMPLES = examples/*.py
 MN = bin/mn
-MNCCNX = bin/miniccnx
-MNCCNXEDIT = bin/miniccnxedit
-BIN = $(MN) $(MNCCNX) $(MNCCNXEDIT)
+BIN = $(MN)
 PYSRC = $(MININET) $(TEST) $(EXAMPLES) $(BIN)
 MNEXEC = mnexec
 MANPAGES = mn.1 mnexec.1
diff --git a/setup.py b/setup.py
index 3f9f0eb..86cc6cd 100644
--- a/setup.py
+++ b/setup.py
@@ -10,22 +10,24 @@
 sys.path.append( '.' )
 from mininet.net import VERSION
 
-scripts = [ join( 'bin', filename ) for filename in [ 'mn' ] ]
+scripts = [ join( 'bin', filename ) for filename in [ 'mn' 'miniccnx' 'miniccnxedit' ] ]
 
 modname = distname = 'mininet'
 
 setup(
     name=distname,
     version=VERSION,
-    description='Process-based OpenFlow emulator',
-    author='Bob Lantz',
-    author_email='rlantz@cs.stanford.edu',
+    description='Process-based OpenFlow emulator with CCNx extension',
+    author='Bob Lantz, Carlos Cabral',
+    author_email='rlantz@cs.stanford.edu, cabral@dca.fee.unicamp.br',
     packages=find_packages(exclude='test'),
     long_description="""
         Mininet is a network emulator which uses lightweight
         virtualization to create virtual networks for rapid
         prototyping of Software-Defined Network (SDN) designs
-        using OpenFlow. http://openflow.org/mininet
+        using OpenFlow. http://openflow.org/mininet.
+	This also includes an extension for using Content Centric
+	Networks based on the NDN model (project CCNx).
         """,
     classifiers=[
           "License :: OSI Approved :: BSD License",
@@ -34,7 +36,7 @@
           "Intended Audience :: Developers",
           "Topic :: Internet",
     ],
-    keywords='networking emulator protocol Internet OpenFlow SDN',
+    keywords='networking emulator protocol Internet OpenFlow SDN CCNx CCN',
     license='BSD',
     install_requires=[
         'setuptools',