diff --git a/.gitignore b/.gitignore
index e8cbbcc..6949c08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ Trac-0.11.7.tar.gz
 /Trac-0.12.1.tar.gz
 /Trac-0.12.2.tar.gz
 /Trac-0.12.3.tar.gz
+/Trac-1.0.tar.gz
diff --git a/sources b/sources
index 8124c14..b64d679 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0cef201e223fafb5c3dd99577403f572  Trac-0.12.3.tar.gz
+e07f052ec91efc1733cb9d49743ecb32  Trac-1.0.tar.gz
diff --git a/trac.spec b/trac.spec
index df261bd..7151e42 100644
--- a/trac.spec
+++ b/trac.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.12.3
-Release:        4%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 Group:          Applications/Internet
 License:        BSD
@@ -13,7 +13,7 @@ Source2:        trac.ini
 Source3:        trac.ini-environment_sample
 Source4:        %{name}-README.fedora
 Source5:        trac.wsgi
-Patch0:         trac-0.12.3-pidfile.patch
+#Patch0:         trac-0.12.3-pidfile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel
@@ -37,7 +37,7 @@ development more streamlined and effective.
 %prep
 %setup -q -n Trac-%{version}
 
-%patch0 -p0 -b .pidfile
+#%patch0 -p0 -b .pidfile
 
 find contrib -type f -exec chmod -x '{}' \;
 # don't package windows specific files
@@ -56,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
 #mv cgi-bin/trac.*cgi $RPM_BUILD_ROOT%{_var}/www/cgi-bin
 #install -Dpm 755 %{SOURCE5} $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-install -Dpm 755 %{SOURCE5} cgi-bin/
+install -Dpm 755 %{SOURCE5} contrib/cgi-bin/
 
 #install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/trac/trac.ini
@@ -75,7 +75,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README README.fedora RELEASE THANKS UPGRADE contrib/ cgi-bin/trac.*gi
+%doc AUTHORS ChangeLog COPYING INSTALL README README.fedora RELEASE THANKS UPGRADE contrib/
 %{_bindir}/trac-admin
 %{_sbindir}/tracd
 %{python_sitelib}/*
@@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 #%{_var}/www/cgi-bin/trac.wsgi
 
 %changelog
+* Wed Sep 12 2012 Jon Ciesla <limburgher@gmail.com> - 1.0-1
+- 1.0, BZ 855519
+- Pidfile patch upstreamed.
+
 * Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild