diff --git a/.gitignore b/.gitignore
index e69de29..f91e578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/drupal-7.0.tar.gz
diff --git a/drupal7-7.0-scripts-noshebang.patch b/drupal7-7.0-scripts-noshebang.patch
new file mode 100644
index 0000000..3276e3c
--- /dev/null
+++ b/drupal7-7.0-scripts-noshebang.patch
@@ -0,0 +1,63 @@
+diff -U3 -r scripts.orig/code-clean.sh scripts/code-clean.sh
+--- scripts.orig/code-clean.sh	2009-03-09 15:46:37.000000000 -0500
++++ scripts/code-clean.sh	2011-02-21 20:39:32.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # $Id: code-clean.sh,v 1.10 2009/03/09 20:46:37 dries Exp $
+ 
+ find . -name "*~" -type f | xargs rm -f
+Only in scripts/: code-clean.sh~
+diff -U3 -r scripts.orig/cron-curl.sh scripts/cron-curl.sh
+--- scripts.orig/cron-curl.sh	2006-08-22 02:38:24.000000000 -0500
++++ scripts/cron-curl.sh	2011-02-21 20:39:36.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # $Id: cron-curl.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
+ 
+ curl --silent --compressed http://example.com/cron.php
+Only in scripts/: cron-curl.sh~
+diff -U3 -r scripts.orig/cron-lynx.sh scripts/cron-lynx.sh
+--- scripts.orig/cron-lynx.sh	2006-08-22 02:38:24.000000000 -0500
++++ scripts/cron-lynx.sh	2011-02-21 20:39:41.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/bin/sh
+ # $Id: cron-lynx.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
+ 
+ /usr/bin/lynx -source http://example.com/cron.php > /dev/null 2>&1
+Only in scripts/: cron-lynx.sh~
+diff -U3 -r scripts.orig/drupal.sh scripts/drupal.sh
+--- scripts.orig/drupal.sh	2009-09-19 05:38:47.000000000 -0500
++++ scripts/drupal.sh	2011-02-21 20:39:45.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env php
+ <?php
+ // $Id: drupal.sh,v 1.9 2009/09/19 10:38:47 dries Exp $
+ 
+Only in scripts/: drupal.sh~
+diff -U3 -r scripts.orig/dump-database-d6.sh scripts/dump-database-d6.sh
+--- scripts.orig/dump-database-d6.sh	2010-07-29 20:28:00.000000000 -0500
++++ scripts/dump-database-d6.sh	2011-02-21 20:39:50.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env php
+ <?php
+ // $Id: dump-database-d6.sh,v 1.3 2010/07/30 01:28:00 dries Exp $
+ 
+Only in scripts/: dump-database-d6.sh~
+diff -U3 -r scripts.orig/generate-d6-content.sh scripts/generate-d6-content.sh
+--- scripts.orig/generate-d6-content.sh	2010-09-10 19:39:49.000000000 -0500
++++ scripts/generate-d6-content.sh	2011-02-21 20:39:54.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env php
+ <?php
+ // $Id: generate-d6-content.sh,v 1.3 2010/09/11 00:39:49 webchick Exp $
+ 
+Only in scripts/: generate-d6-content.sh~
+diff -U3 -r scripts.orig/password-hash.sh scripts/password-hash.sh
+--- scripts.orig/password-hash.sh	2010-05-01 03:12:23.000000000 -0500
++++ scripts/password-hash.sh	2011-02-21 20:40:06.000000000 -0600
+@@ -1,4 +1,3 @@
+-#!/usr/bin/php
+ <?php
+ // $Id: password-hash.sh,v 1.7 2010/05/01 08:12:23 dries Exp $
+ 
+Only in scripts/: password-hash.sh~
diff --git a/drupal7-README.fedora b/drupal7-README.fedora
new file mode 100644
index 0000000..3a178bf
--- /dev/null
+++ b/drupal7-README.fedora
@@ -0,0 +1,73 @@
+Initially upon install, Drupal requires two additional installation steps:
+
+1. DB setup
+
+To begin with, install php-mysql or php-pgsql, depending on which db backend
+you intend to use.
+
+Then, follow the installation instructions in INSTALL.*.txt to complete the 
+setup of and connection of Drupal to the required database, including chmod 
+666 on /etc/drupal7/default/settings.php, uncommenting the appropriate line in 
+/etc/httpd/conf.d/drupal7.conf, and restarting httpd.
+
+Once these steps have been completed, you should be ready to connect to http://yourhost/drupal7
+to complete the initial setup.
+
+Remember to change the /etc/drupal7/default/settings.php permissions back to 
+644 when you've finished the initial setup.
+
+2. Enable remote access
+
+Drupal ships in Fedora with all non-localhost access disabled.  Comment and
+uncomment lines in /etc/httpd/conf.d/drupal7.conf as appropriate, and restart
+httpd.
+
+Regarding the file layout:
+Pay careful attention to the placement of the directories as established by
+the package.  If you need to relocate files due to size, for custom modules
+not included in Fedora, or for large custom site data, be careful to do so
+without altering any of the symlinks owned by the package.  Most configurations
+should not run into problems, but if any symlinks are changed, they will be
+re-written when the package is upgraded, which could break the site until
+you re-change the symlink.
+
+2a. SELinux configuration
+
+If running with SELinux in Enforcing mode, you'll need run the following to allow drupal 
+to send mail from httpd using sendmail:
+
+/usr/sbin/setsebool -P httpd_can_sendmail 1  
+
+3. SSL/TLS usage.
+CVE-2008-3661 relates to the security of session cookies and SSL/TLS.
+
+http://int21.de/cve/CVE-2008-3661-drupal.html
+http://www.securityfocus.com/bid/31285
+
+To help mitigate this, uncomment the following line in /etc/httpd/conf.d/drupal7.conf:
+#php_flag session.cookie_secure on
+
+
+4. Upgrading
+
+Prior to upgrading to a new version, log into each site with the first/admin user, 
+upgrade the rpm, and then run the database upgrader by navigating to
+http://site/update.php.
+
+If upgrading to version 6.9-2 or later, please note that
+the locations for the sites' files directories has changed, and that you'll need
+to move them and symlink accordingly.  A script is included in the doc folder:
+/usr/share/drupal7-VERSION/drupal-files-migrator.sh.  Please use this script as a
+guideline for the changes you'll need to make. 
+
+Essentially, the site folders will stay in /etc/drupal7, but from there the files folders
+will be moved to /var/lib/drupal7/files/SITENAME, and symlinked accordingly.  This is done
+for SELinux reasons, see https://bugzilla.redhat.com/show_bug.cgi?id=472642.
+
+Patches to the script are welcome!
+
+5. Modules
+
+There are some drupal modules in Fedora.  These will install in 
+/usr/share/drupal7/modules, and you should install your modules there as well.
+
diff --git a/drupal7-cron b/drupal7-cron
new file mode 100644
index 0000000..fb81599
--- /dev/null
+++ b/drupal7-cron
@@ -0,0 +1,2 @@
+#!/bin/sh
+wget -O - -q http://localhost/drupal7/cron.php
diff --git a/drupal7-files-migrator.sh b/drupal7-files-migrator.sh
new file mode 100644
index 0000000..dfbe5bc
--- /dev/null
+++ b/drupal7-files-migrator.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+cd /etc/drupal7
+for i in `ls -1`; do
+mv $i/files /var/lib/drupal7/files/$i
+/sbin/restorecon /var/lib/drupal7/files/$i
+ln -s /var/lib/drupal7/files/$i /etc/drupal7/$i/files
+done
diff --git a/drupal7.conf b/drupal7.conf
new file mode 100644
index 0000000..4b1607c
--- /dev/null
+++ b/drupal7.conf
@@ -0,0 +1,17 @@
+#
+# Drupal is an open-source content-management platform.
+#
+
+Alias /drupal7 /usr/share/drupal7
+
+<Directory /usr/share/drupal7/>
+        Order Deny,Allow
+	#Comment the following line and uncomment the next for public use 
+        Deny from all
+	#Allow from all
+	#Uncomment the following line for setup
+        #Allow from 127.0.0.1
+	AllowOverride All
+	#Uncomment the next line if using with SSL/TLS
+	#php_flag session.cookie_secure on
+</Directory>
diff --git a/drupal7.spec b/drupal7.spec
new file mode 100644
index 0000000..bbd0c7e
--- /dev/null
+++ b/drupal7.spec
@@ -0,0 +1,106 @@
+%define drupaldir %{_datadir}/drupal7
+Name: drupal7
+Version:  7.0
+Release:  4%{?dist}
+Summary: An open-source content-management platform
+
+Group: Applications/Publishing
+License: GPLv2+ and BSD
+URL: http://www.drupal.org
+Source0: http://ftp.osuosl.org/pub/drupal/files/projects/drupal-%{version}.tar.gz
+Source1: %{name}.conf
+Source2: %{name}-README.fedora
+Source3: %{name}-cron
+Source4: %{name}-files-migrator.sh
+Patch0:  %{name}-7.0-scripts-noshebang.patch
+
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: php, php-gd, php-mbstring, wget, php-pdo, php-xml
+
+%description
+Equipped with a powerful blend of features, Drupal is a Content Management 
+System written in PHP that can support a variety of websites ranging from
+personal weblogs to large community-driven websites.  Drupal is highly
+configurable, skinnable, and secure.
+
+%prep
+
+%setup -q -n drupal-%{version}
+
+%patch0 -p0
+
+chmod -x scripts/drupal.sh
+chmod -x scripts/password-hash.sh
+chmod -x scripts/run-tests.sh
+
+%build
+
+%install
+rm -rf %{buildroot}
+install -d %{buildroot}%{drupaldir}
+cp -pr * %{buildroot}%{drupaldir}
+cp -pr .htaccess %{buildroot}%{drupaldir}
+mkdir -p %{buildroot}%{_sysconfdir}/httpd
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+cp -pr %SOURCE1 %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules
+mkdir -p %{buildroot}%{_sysconfdir}/%{name}/themes
+mv %{buildroot}%{drupaldir}/sites/* %{buildroot}%{_sysconfdir}/%{name}
+rmdir %{buildroot}%{drupaldir}/sites
+ln -s ../../..%{_sysconfdir}/%{name} %{buildroot}%{drupaldir}/sites
+mkdir -p %{buildroot}%{_docdir}
+cp -pr %SOURCE2 .
+install -D -p -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/cron.hourly/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}/files/default
+ln -s ../../..%{_localstatedir}/lib/%{name}/files/default %{buildroot}%{_sysconfdir}/%{name}/default/files
+cp -pr %SOURCE4 .
+mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
+mv %{buildroot}%{drupaldir}/.htaccess %{buildroot}%{_sysconfdir}/httpd/conf.d/drupal7-site.htaccess
+ln -s ../../../%{_sysconfdir}/httpd/conf.d/drupal7-site.htaccess %{buildroot}%{drupaldir}/.htaccess
+mv %{buildroot}%{_sysconfdir}/%{name}/example.sites.php .
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc CHANGELOG.txt INSTALL* LICENSE* MAINTAINERS.txt UPGRADE.txt %{name}-README.fedora sites/all/README.txt %{name}-files-migrator.sh
+%doc COPYRIGHT.txt README.txt example.sites.php
+%{drupaldir}
+%exclude %{drupaldir}/CHANGELOG.txt
+%exclude %{drupaldir}/INSTALL* 
+%exclude %{drupaldir}/LICENSE* 
+%exclude %{drupaldir}/MAINTAINERS.txt 
+%exclude %{drupaldir}/UPGRADE.txt
+%exclude %{drupaldir}/COPYRIGHT.txt
+%exclude %{drupaldir}/README.txt
+%dir %{_sysconfdir}/%{name}/*
+%config(noreplace) %{_sysconfdir}/%{name}/all
+%exclude %{_sysconfdir}/%{name}/all/README.txt
+%config(noreplace) %{_sysconfdir}/%{name}/default
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}*.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}*.htaccess
+%attr(755,root,apache) %config(noreplace) %{_sysconfdir}/cron.hourly/%{name}
+%dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/
+%dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/files/
+%dir %attr(775,root,apache) %{_localstatedir}/lib/%{name}/files/default/
+
+%changelog
+* Wed Apr 06 2011 Jon Ciesla <limb@jcomserv.net> - 7.0-4
+- Exlcuded README and COPYRIGHT.
+- Fixed sites symlink.
+
+* Tue Mar 29 2011 Jon Ciesla <limb@jcomserv.net> - 7.0-3
+- Fixed sites symlink.
+- Moved example.sites.php to doc.
+- Fixed year in changelog.
+- Added php-pdo and php-xml requires.
+- Corrected license tag.
+
+* Fri Feb 25 2011 Jon Ciesla <limb@jcomserv.net> - 7.0-2
+- Corrected license tag.
+
+* Wed Jan 05 2011 Jon Ciesla <limb@jcomserv.net> - 7.0-1
+- Initial packaging.
diff --git a/sources b/sources
index e69de29..580317b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e96c0a5e47c5d7706897384069dfb920  drupal-7.0.tar.gz