diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 00000000..af3a6ae3
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,186 @@
+# Makefile.in
+#
+# Copyright © 2012, 2013 Brandon Invergo <brandon@invergo.net>
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+
+# List whatever files you want to include in your source distribution here.
+# You can include whole directories but note that *everything* under that 
+# directory will be included
+DISTFILES = PKG-INFO Makefile.in configure setup.py install-sh
+
+DESTDIR = 
+VPATH = @srcdir@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_DISTNAME = ${PACKAGE_NAME}-${PACKAGE_VERSION}
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PYTHON = @PYTHON@
+VIRTUALENV = @VIRTUALENV@
+SPHINXBUILD = @SPHINXBUILD@
+SHELL = @SHELL@
+MKDIR_P = @MKDIR_P@
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+prefix = @prefix@
+srcdir = @srcdir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+pythondir = @pythondir@
+pyexecdir = @pyexecdir@
+pkgdatadir = $(datadir)/@PACKAGE_NAME@
+pkgincludedir = $(includedir)/@PACKAGE_NAME@
+pkgpythondir = @pkgpythondir@
+pkgpyexecdir = @pkgpyexecdir@
+PYTHONPATH = $(pythondir)$(PATH_SEPARATOR)$(DESTDIR)$(pythondir)
+
+all: install
+
+.PHONY: all install develop uninstall distclean info install-html html \
+install-pdf pdf install-dvi dvi install-ps ps clean dist check \
+installdirs postgresql update
+
+# Since installing to a virtualenv is all the rage these days, support it here. If the VIRTUALENV
+# variable is set to anything other than "no", set up a new virtualenv and install there, otherwise
+# install as usual from setup.py
+install: installdirs
+	$(NORMAL_INSTALL)
+ifneq ($(VIRTUALENV),no)
+	$(VIRTUALENV) $(VIRTUALENV_FLAGS) --system-site-packages $(DESTDIR)$(prefix) || $(VIRTUALENV) $(DESTDIR)$(prefix)
+	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
+else
+	$(PYTHON) $(srcdir)/setup.py install --prefix=$(DESTDIR)$(prefix)
+endif
+	$(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile
+
+# The same as "install", except use the "develop" setup.py target
+develop: installdirs
+	$(NORMAL_INSTALL)
+ifneq ($(VIRTUALENV),no)
+	$(VIRTUALENV) $(VIRTUALENV_FLAGS) --system-site-packages $(DESTDIR)$(prefix) || $(VIRTUALENV) $(DESTDIR)$(prefix)
+	$(DESTDIR)$(prefix)/bin/python $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
+else
+	$(PYTHON) $(srcdir)/setup.py develop --prefix=$(DESTDIR)$(prefix)
+endif
+	$(INSTALL_DATA) $(srcdir)/Makefile $(DESTDIR)$(prefix)/Makefile
+
+
+# setup.py doesn't (yet) support an uninstall command, so until it does, you 
+# must manually remove everything that was installed here. The following example
+# should remove a basic package installed via setup.py, but please double- and 
+# triple-check it so that you don't remove something you shouldn't!
+# Be sure to remove any extra files you install, such as binaries or documentation!
+uninstall: 
+	rm -rvf $(pkgpythondir)
+	rm -v $(pythondir)/$(PACKAGE_DISTNAME)-*.egg-info
+
+
+# Just use the usual setup.py clean command
+clean:
+	$(PYTHON) setup.py clean
+
+
+# Clean up the output of configure
+distclean: 
+	rm -v $(srcdir)/config.log
+	rm -v $(srcdir)/config.status
+	rm -rvf $(srcdir)/autom4te.cache
+	rm -v $(srcdir)/Makefile
+
+# You can either use the setup.py sdist command or you can roll your own here
+dist:
+#	$(PYTHON) setup.py sdist
+	mkdir $(PACKAGE_DISTNAME)
+	cp -r $(DISTFILES) $(PACKAGE_DISTNAME)
+	tar -czf $(PACKAGE_DISTNAME).tar.gz $(PACKAGE_DISTNAME)
+	rm -rf $(PACKAGE_DISTNAME)
+
+# Use the setup.py check command
+check:
+	$(PYTHON) setup.py check
+
+# setup.py might complain if a directory doesn't exist so just in case, make the directory
+# here
+installdirs:
+	$(MKDIR_P) $(DESTDIR)$(pkgpythondir)
+
+# Set up PostgreSQL
+postgresql:
+	sudo -u postgres createuser mediagoblin
+	sudo -u postgres createdb -E UNICODE -O mediagoblin mediagoblin
+
+update:
+ifneq ($(VIRTUALENV),no)
+	$(prefix)/bin/python $(prefix)/setup.py develop --prefix=$(prefix) --upgrade
+else
+	$(PYTHON) $(prefix)/setup.py develop --prefix=$(DESTDIR)$(prefix) --upgrade
+endif	
+	$(prefix)/bin/gmg dbupdate
+
+# The following show how to install documentation. In this example,
+# docs are built from a separate Makefile contained in the docs
+# directory which uses the SPHINXBUILD variable to store the location
+# of the sphinx-build (Python doc tool) binary to use.
+
+$(DESTDIR)$(infodir)/mediagoblin.info: docs/build/texinfo/mediagoblin.info
+	$(POST_INSTALL)
+	$(INSTALL_DATA) @< $(DESTDIR)$@
+	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then
+		install-info --dir-file=$(DESTDIR)$(infodir)/dir \
+				$(DESTDIR)$(infodir)/foo.info;
+	else true; fi
+
+info: docs/build/texinfo/mediagoblin.info
+
+docs/build/texinfo/mediagoblin.info: $(wildcard docs/source/*)
+ifneq ($(SPHINXBUILD),no)
+	$(MAKE) -C docs info SPHINXBUILD=$(SPHINXBUILD)
+endif
+
+
+install-html: html installdirs
+	$(INSTALL_DATA) docs/build/html/* $(DESTDIR)$(htmldir)
+
+html: docs/build/html/index.html
+
+docs/build/html/index.html: $(wildcard $(srcdir)/docs/source/*)
+ifneq ($(SPHINXBUILD),no)
+	$(MAKE) -C docs html SPHINXBUILD=$(SPHINXBUILD)
+endif
+
+
+install-pdf: pdf installdirs
+	$(INSTALL_DATA) docs/build/latex/mediagoblin.pdf $(DESTDIR)$(pdfdir)
+
+pdf: docs/build/latex/mediagoblin.pdf
+
+docs/build/latex/mediagoblin.pdf: $(wildcard $(srcdir)/docs/source/*)
+ifneq ($(SPHINXBUILD),no)
+	$(MAKE) -C docs latexpdf SPHINXBUILD=$(SPHINXBUILD)
+endif
+
+
+install-dvi:
+
+dvi:
+
+install-ps:
+
+ps:
+
+