diff --git a/.gitignore b/.gitignore
index bad0d87..3292eb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,9 @@ docs/_build
 .pydevproject
 .settings
 
+# Pycharm editor project files
+.idea
+
 # Packages/installer info
 *.egg
 *.egg-info
diff --git a/TEMPLATE_CHANGES.md b/TEMPLATE_CHANGES.md
index a3bd441..62d45bf 100644
--- a/TEMPLATE_CHANGES.md
+++ b/TEMPLATE_CHANGES.md
@@ -5,7 +5,7 @@ be removed in affiliated packages.
 0.4.2 (untagged)
 ----------------
 
-- No changes yet
+- Use setuptools entry_points for command line scripts
 
 0.4.1 (2014-10-22)
 ------------------
diff --git a/scripts/README.rst b/scripts/README.rst
deleted file mode 100644
index a631c0c..0000000
--- a/scripts/README.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Scripts
-=======
-
-This directory contains command-line scripts for the affiliated package.
-
diff --git a/scripts/script_example b/scripts/script_example
deleted file mode 100755
index 22190d5..0000000
--- a/scripts/script_example
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""An example command-line script"""
-
-import packagename.example_mod
-
-packagename.example_mod.main()
diff --git a/setup.py b/setup.py
index 7f931bd..9d707c9 100755
--- a/setup.py
+++ b/setup.py
@@ -78,6 +78,12 @@
 package_info['package_data'].setdefault(PACKAGENAME, [])
 package_info['package_data'][PACKAGENAME].append('data/*')
 
+# Define entry points for command-line scripts
+entry_points = {}
+entry_points['console_scripts'] = [
+    'astropy-package-template-example = packagename.example_mod:main',
+]
+
 # Include all .c files, recursively, including those generated by
 # Cython, since we can not do this in MANIFEST.in with a "dynamic"
 # directory name.
@@ -105,5 +111,6 @@
       cmdclass=cmdclassd,
       zip_safe=False,
       use_2to3=True,
+      entry_points=entry_points,
       **package_info
 )