diff --git a/.gitignore b/.gitignore
index fc82490..d8fc996 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ freeipmi-0.8.8.tar.gz
 /freeipmi-0.8.10.tar.gz
 /freeipmi-0.8.11.tar.gz
 /freeipmi-0.8.12.tar.gz
+/freeipmi-1.0.1.tar.gz
diff --git a/freeipmi.spec b/freeipmi.spec
index bc4d543..ccf0e6d 100644
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@ -5,7 +5,7 @@
 Release: 1%{?dist}
 
 Name: freeipmi
-Version: 0.8.12
+Version: 1.0.1
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/freeipmi/
@@ -132,8 +132,12 @@ fi
 
 %files
 %defattr(-,root,root)
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/ipmi_monitoring_sensors.conf
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/freeipmi.conf
+%dir %{_sysconfdir}/freeipmi/
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/freeipmi.conf
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/ipmidetect.conf
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/freeipmi_interpret_sel.conf
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/freeipmi_interpret_sensor.conf
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/libipmiconsole.conf
 %doc %{_datadir}/doc/%{name}/AUTHORS
 %doc %{_datadir}/doc/%{name}/COPYING
 %doc %{_datadir}/doc/%{name}/ChangeLog
@@ -148,7 +152,6 @@ fi
 %doc %{_infodir}/*
 %doc %{_datadir}/doc/%{name}/COPYING.ipmiping
 %doc %{_datadir}/doc/%{name}/COPYING.ipmipower
-%doc %{_datadir}/doc/%{name}/COPYING.rmcpping
 %doc %{_datadir}/doc/%{name}/COPYING.ipmiconsole
 %doc %{_datadir}/doc/%{name}/COPYING.ipmimonitoring
 %doc %{_datadir}/doc/%{name}/COPYING.pstdout
@@ -159,7 +162,6 @@ fi
 %doc %{_datadir}/doc/%{name}/COPYING.ZRESEARCH
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower
-%doc %{_datadir}/doc/%{name}/DISCLAIMER.rmcpping
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiconsole
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmimonitoring
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.pstdout
@@ -168,13 +170,13 @@ fi
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmi-dcmi
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiping.UC
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmipower.UC
-%doc %{_datadir}/doc/%{name}/DISCLAIMER.rmcpping.UC
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmiconsole.UC
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmimonitoring.UC
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.pstdout.UC
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmidetect.UC
 %doc %{_datadir}/doc/%{name}/DISCLAIMER.ipmi-fru.UC
 %doc %{_datadir}/doc/%{name}/freeipmi-coding.txt
+%doc %{_datadir}/doc/%{name}/freeipmi-design.txt
 %doc %{_datadir}/doc/%{name}/freeipmi-hostrange.txt
 %doc %{_datadir}/doc/%{name}/freeipmi-libraries.txt
 %doc %{_datadir}/doc/%{name}/freeipmi-bugs-issues-and-workarounds.txt
@@ -199,14 +201,19 @@ fi
 %{_sbindir}/ipmi-sensors
 %{_sbindir}/ipmi-sensors-config
 %{_sbindir}/ipmiping
+%{_sbindir}/ipmi-ping
 %{_sbindir}/ipmipower
+%{_sbindir}/ipmi-power
 %{_sbindir}/rmcpping
+%{_sbindir}/rmcp-ping
 %{_sbindir}/ipmiconsole
+%{_sbindir}/ipmi-console
 %{_sbindir}/ipmimonitoring
 %{_sbindir}/ipmi-chassis
 %{_sbindir}/ipmi-chassis-config
 %{_sbindir}/ipmi-dcmi
 %{_sbindir}/ipmidetect
+%{_sbindir}/ipmi-detect
 %{_mandir}/man8/bmc-config.8*
 %{_mandir}/man5/bmc-config.conf.5*
 %{_mandir}/man8/bmc-info.8*
@@ -221,22 +228,30 @@ fi
 %{_mandir}/man8/ipmi-sensors.8*
 %{_mandir}/man8/ipmi-sensors-config.8*
 %{_mandir}/man8/ipmiping.8*
+%{_mandir}/man8/ipmi-ping.8*
 %{_mandir}/man8/ipmipower.8*
+%{_mandir}/man8/ipmi-power.8*
 %{_mandir}/man5/ipmipower.conf.5*
 %{_mandir}/man8/rmcpping.8*
+%{_mandir}/man8/rmcp-ping.8*
 %{_mandir}/man8/ipmiconsole.8*
+%{_mandir}/man8/ipmi-console.8*
 %{_mandir}/man5/ipmiconsole.conf.5*
 %{_mandir}/man8/ipmimonitoring.8*
 %{_mandir}/man5/ipmi_monitoring_sensors.conf.5*
 %{_mandir}/man5/ipmimonitoring_sensors.conf.5*
 %{_mandir}/man5/ipmimonitoring.conf.5*
+%{_mandir}/man5/freeipmi_interpret_sel.conf.5*
+%{_mandir}/man5/freeipmi_interpret_sensor.conf.5*
 %{_mandir}/man5/libipmimonitoring.conf.5*
 %{_mandir}/man8/ipmi-chassis.8*
 %{_mandir}/man8/ipmi-chassis-config.8*
 %{_mandir}/man8/ipmi-dcmi.8*
 %{_mandir}/man8/ipmidetect.8*
+%{_mandir}/man8/ipmi-detect.8*
 %{_mandir}/man5/freeipmi.conf.5*
 %{_mandir}/man5/ipmidetect.conf.5*
+%{_mandir}/man5/libipmiconsole.conf.5*
 %{_mandir}/man7/freeipmi.7*
 %dir %{_localstatedir}/cache/ipmimonitoringsdrcache
 
@@ -254,7 +269,9 @@ fi
 %dir %{_includedir}/freeipmi/fiid
 %dir %{_includedir}/freeipmi/fru-parse
 %dir %{_includedir}/freeipmi/interface
+%dir %{_includedir}/freeipmi/interpret
 %dir %{_includedir}/freeipmi/locate
+%dir %{_includedir}/freeipmi/payload
 %dir %{_includedir}/freeipmi/record-format
 %dir %{_includedir}/freeipmi/sdr-cache
 %dir %{_includedir}/freeipmi/sdr-parse
@@ -265,7 +282,7 @@ fi
 %dir %{_includedir}/freeipmi/util
 %{_includedir}/ipmiconsole.h
 %{_includedir}/ipmidetect.h
-%{_includedir}/ipmi_monitoring.h
+%{_includedir}/ipmi_monitoring*.h
 %{_includedir}/freeipmi/*.h
 %{_includedir}/freeipmi/api/*.h
 %{_includedir}/freeipmi/cmds/*.h
@@ -274,7 +291,9 @@ fi
 %{_includedir}/freeipmi/fiid/*.h
 %{_includedir}/freeipmi/fru-parse/*.h
 %{_includedir}/freeipmi/interface/*.h
+%{_includedir}/freeipmi/interpret/*.h
 %{_includedir}/freeipmi/locate/*.h
+%{_includedir}/freeipmi/payload/*.h
 %{_includedir}/freeipmi/record-format/*.h
 %{_includedir}/freeipmi/sdr-cache/*.h
 %{_includedir}/freeipmi/sdr-parse/*.h
@@ -300,12 +319,19 @@ fi
 %files ipmidetectd
 %defattr(-,root,root)
 %{_initrddir}/ipmidetectd
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/ipmidetectd.conf
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/freeipmi/ipmidetectd.conf
 %{_sbindir}/ipmidetectd
 %{_mandir}/man5/ipmidetectd.conf.5*
 %{_mandir}/man8/ipmidetectd.8*
 
 %changelog
+* Fri Jan 21 2011 Jan Safranek <jsafrane@redhat.com> - 1.0.1:1
+- Updated to freeipmi-0.8.12, see announce at
+  http://lists.gnu.org/archive/html/freeipmi-users/2011-01/msg00006.html
+- Configuration files moved from /etc/ to /etc/freeipmi/. Support legacy config
+  files for backwards compatibility.
+- More detailed release information can be found in the NEWS file.
+
 * Tue Dec  7 2010 Jan Safranek <jsafrane@redhat.com> - 0.8.12-1
 - Updated to freeipmi-0.8.12, see announce at
   http://lists.gnu.org/archive/html/freeipmi-users/2010-12/msg00000.html
diff --git a/sources b/sources
index fcdb252..4ffa9ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-37fd261f5836e74b53ad583737859533  freeipmi-0.8.12.tar.gz
+4af11fb5645f025ac157684e3f5db98e  freeipmi-1.0.1.tar.gz