diff --git a/Changes b/Changes
index d51d5c9..55d1544 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,7 @@
 * Extract dependencies from tests.
 * curl doesn't tell us what it is downloading, so be more verbose.
 * Don't download files with curl unless they've been modified.
+* Add script detection (patch from Jeff Fearn).
 
 1.78    2009-01-16
 
diff --git a/cpanspec b/cpanspec
index 15b63e3..e77b2c4 100755
--- a/cpanspec
+++ b/cpanspec
@@ -808,7 +808,8 @@ for my $file (@args) {
 
     my $license="";
 
-    my $scripts=0;
+    # TODO It's possible these need to be listed instead of just detected.
+    my $scripts=(grep /^(?:bin|scripts)\//, @files);
     my (%build_requires,%requires);
     my ($yml,$meta);
     if (grep /^META\.yml$/, @files
@@ -1187,7 +1188,7 @@ END
 
     if ($scripts) {
         print $spec "\%{_bindir}/*\n";
-        # FIXME - How do we auto-detect man pages?
+        print $spec "\%{_mandir}/man1/*\n";
     }
 
     if ($noarch) {