diff --git a/python-boto.spec b/python-boto.spec
index ac783f0..f0c5e7b 100644
--- a/python-boto.spec
+++ b/python-boto.spec
@@ -6,6 +6,7 @@
 %bcond_with unittests
 %endif
 
+# Boto's sample executables became doc files in F23
 %if 0%{?fedora} >= 23
 %bcond_with executables
 %else
@@ -132,7 +133,9 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/*
 %{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
 %if %{without executables}
-rm -f $RPM_BUILD_ROOT/%{_bindir}/*
+# Make executables doc files instead
+chmod -x $RPM_BUILD_ROOT/%{_bindir}/*
+mv $RPM_BUILD_ROOT/%{_bindir} examples
 %endif
 
 
@@ -151,28 +154,11 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/*
 %license boto-mit-license.txt
 %doc README.rst
 %{python2_sitelib}/boto*
+
 %if %{with executables}
-%{_bindir}/asadmin
-%{_bindir}/bundle_image
-%{_bindir}/cfadmin
-%{_bindir}/cq
-%{_bindir}/cwutil
-%{_bindir}/dynamodb_dump
-%{_bindir}/dynamodb_load
-%{_bindir}/elbadmin
-%{_bindir}/fetch_file
-%{_bindir}/glacier
-%{_bindir}/instance_events
-%{_bindir}/kill_instance
-%{_bindir}/launch_instance
-%{_bindir}/list_instances
-%{_bindir}/lss3
-%{_bindir}/mturk
-%{_bindir}/pyami_sendmail
-%{_bindir}/route53
-%{_bindir}/s3put
-%{_bindir}/sdbadmin
-%{_bindir}/taskadmin
+%{_bindir}/*
+%else
+%doc examples
 %endif
 
 
@@ -187,6 +173,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/*
 * Fri Apr 10 2015 Garrett Holmstrom <gholms@fedoraproject.org> - 2.38.0-1
 - Updated to 2.38.0
 - Added BuildRequires for python-six
+- Made sample executables doc files in F23
 
 * Wed Apr  8 2015 Garrett Holmstrom <gholms@fedoraproject.org> - 2.37.0-1
 - Updated to 2.37.0 (RH #1180861)