diff --git a/configure.py b/configure.py
index 484cd2c1..015bc140 100644
--- a/configure.py
+++ b/configure.py
@@ -25,4 +25,6 @@ run.options.add_option('-s', '--sdks', default='all', dest='sdks',
                             'comma-delimited list of engine names (default: %default)')
 run.options.add_option('--breakpad-dump', action='store_true', dest='breakpad_dump',
 											 default=False, help='Dump and upload breakpad symbols')
+run.options.add_option('--package-debug', action='store_true', default=False, dest='packdebug',
+                       help='Package files useful for debugging.')
 run.Configure()
diff --git a/tools/buildbot/PackageScript b/tools/buildbot/PackageScript
index 641efb77..9528401a 100644
--- a/tools/buildbot/PackageScript
+++ b/tools/buildbot/PackageScript
@@ -51,6 +51,13 @@ for cxx_task in SM.extensions:
   builder.AddCopy(cxx_task.binary, folder_map['addons/sourcemod/extensions'])
 builder.AddCopy(SM.spcomp.binary, folder_map['addons/sourcemod/scripting'])
 
+# Copy debugging files.
+if builder.options.packdebug and builder.target_platform is not 'mac':
+  for cxx_task in SM.binaries:
+    builder.AddCopy(cxx_task.debug, folder_map['addons/sourcemod/bin'])
+  for cxx_task in SM.extensions:
+    builder.AddCopy(cxx_task.debug, folder_map['addons/sourcemod/extensions'])
+
 # Copy version_auto.inc.
 for header in SM.generated_headers:
   if 'version_auto.inc' in header.path: