diff --git a/beep-README.fedora b/beep-README.fedora
new file mode 100644
index 0000000..9572598
--- /dev/null
+++ b/beep-README.fedora
@@ -0,0 +1,22 @@
+On systems with Fedora 12 or later, the kernel does not by default
+alias the system device to the pcspkr.ko kernel driver any more. This
+means that the pcspkr.ko driver is not loaded by default any more on
+system startup.
+
+You can check whether pcspkr.ko is loaded by running "lsmod | grep
+pcspkr".
+
+On these systems, the beep package ships a config file
+/etc/modprobe.d/beep.conf with a configuration line that reintroduces
+the default loading of pcspkr.ko. Due to possible side effects, you
+will need to manually uncomment that line in the beep.conf file, though.
+
+You do not need to reboot your system in order to get pcspkr.ko
+loaded, though. Running "modprobe pcspkr" should do the job without a
+reboot.
+
+Caution: There appear to be some issues with access to the
+/dev/console device which beep uses, possibly related to
+ConsoleKit. This means that sometimes, just having pcspkr.ko loaded is
+not enough for beep to actually beep. This issue is being
+investigated.
diff --git a/beep-modprobe.conf b/beep-modprobe.conf
new file mode 100644
index 0000000..c1ddb22
--- /dev/null
+++ b/beep-modprobe.conf
@@ -0,0 +1,3 @@
+# Uncomment the following line to have the pcspkr driver loaded
+# automatically on boot
+# alias platform:pcspkr pcspkr
diff --git a/beep.spec b/beep.spec
index bd88833..c895dcb 100644
--- a/beep.spec
+++ b/beep.spec
@@ -1,12 +1,21 @@
+%if 0%{?fedora} >= 12
+%global ship_modprobe_config 1
+%else
+%global ship_modprobe_config 0
+%endif
+
+
 Summary:        Beep the PC speaker any number of ways
 Name:           beep
 Version:        1.2.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.johnath.com/beep/
 Source0:        http://www.johnath.com/beep/%{name}-%{version}.tar.gz
+Source1:        %{name}-README.fedora
+Source2:        %{name}-modprobe.conf
 Patch0:         beep-1.2.2-install-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +34,7 @@ what's interesting, but it's real good at that notifying part.
 %prep
 %setup -q
 %patch0 -p1 -b .install-fixes
+cp -p %{SOURCE1} README.fedora
 
 
 %build
@@ -35,6 +45,11 @@ make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%if %{ship_modprobe_config}
+install -d -m 0755 "$RPM_BUILD_ROOT/etc/modprobe.d/"
+install -p -m 0644 %{SOURCE2} "$RPM_BUILD_ROOT/etc/modprobe.d/beep.conf"
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,9 +60,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGELOG COPYING CREDITS README
 %attr(0755,root,root) %{_bindir}/beep
 %{_mandir}/man1/beep.1.gz
+%if %{ship_modprobe_config}
+%doc README.fedora
+%attr(0644,root,root) %{_sysconfdir}/modprobe.d/beep.conf
+%endif
 
 
 %changelog
+* Fri Jan 22 2010 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.2.2-6
+- Ship modprobe config file with alias for pcspkr on F12 and later
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild