diff --git a/.gitignore b/.gitignore
index 80ad9ea..833f4d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,6 @@ depcomp
 install-sh
 missing
 stamp-h1
-xcompmgr
+compton
 *.o
 *~
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..84a6f2a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+PACKAGES = x11 xcomposite xfixes xdamage xrender
+LIBS = `pkg-config --libs ${PACKAGES}` -lm
+INCS = `pkg-config --cflags ${PACKAGES}`
+CFLAGS = -Wall
+PREFIX = /usr/local
+MANDIR = ${PREFIX}/share/man/man1
+
+OBJS=compton.o
+
+.c.o:
+	$(CC) $(CFLAGS) $(INCS) -c $*.c
+
+compton: $(OBJS)
+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
+
+$(OBJS): compton.h
+
+install: compton
+	@cp -t ${PREFIX}/bin compton
+	@[ -d "${MANDIR}" ] \
+	  && cp -t "${MANDIR}" compton.1
+
+uninstall:
+	@rm -f ${PREFIX}/compton
+	@rm -f ${MANDIR}/compton.1
+
+clean:
+	rm -f $(OBJS) compton
+
+.PHONY: uninstall clean
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 4bc0ba3..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-bin_PROGRAMS = xcompmgr
-man_MANS = xcompmgr.1
-
-xcompmgr_LDADD = @XCOMPMGR_LIBS@ -lm
-
-INCLUDES = @XCOMPMGR_CFLAGS@
-
-EXTRA_DIST = \
-	autogen.sh \
-	ChangeLog \
-	${man_MANS}
-
-MAINTAINERCLEANFILES=ChangeLog
-
-.PHONY: ChangeLog
-
-ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
-
-dist-hook: ChangeLog
-
diff --git a/Makefile_ b/Makefile_
deleted file mode 100644
index 0eace7b..0000000
--- a/Makefile_
+++ /dev/null
@@ -1,22 +0,0 @@
-PACKAGES=x11 xcomposite xfixes xdamage xrender
-LIBS=`pkg-config --libs ${PACKAGES}` -lm
-INCS=`pkg-config --cflags ${PACKAGES}`
-CFLAGS = -Wall
-
-.c.o:
-	$(CC) $(CFLAGS) $(INCS) -c $*.c
-
-OBJS=xcompmgr.o
-
-xcompmgr: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
-
-$(OBJS): xcompmgr.h
-
-install:
-	cp -t /usr/bin/local xcompmgr
-
-clean:
-	rm -f $(OBJS) xcompmgr
-
-.PHONY: install clean
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29..0000000
diff --git a/README.md b/README.md
index 62f3eae..68d36a2 100644
--- a/README.md
+++ b/README.md
@@ -60,17 +60,15 @@ The same dependencies and build as xcompmgr.
 To build, make sure you have the above dependencies:
 
 ``` bash
-$ ./autogen.sh
 $ make
+$ make install
 ```
 
-The above will produce a single binary.
-
 ## Usage
 
 ``` bash
-$ xcompmgr -cC -t -5 -l -5 -r 5 -o 0.4 \
+$ compton -cC -t -5 -l -5 -r 5 -o 0.4 \
   -fF -I 0.065 -O 0.065 -D 6 -m 0.8 -i 0.6 -e 0.6 &
 
-$ xcompmgr -cC -t -5 -l -5 -r 5 -o 0.4 -i 0.6 -e 0.6 &
+$ compton -cC -t -5 -l -5 -r 5 -o 0.4 -i 0.6 -e 0.6 &
 ```
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index d68a142..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-autoreconf -v --install || exit 1
-./configure "$@"
diff --git a/xcompmgr.1 b/compton.1
similarity index 55%
rename from xcompmgr.1
rename to compton.1
index 0aabb4f..9f15ad2 100644
--- a/xcompmgr.1
+++ b/compton.1
@@ -1,15 +1,17 @@
 .ds q \N'34'
-.TH xcompmgr 1
+.TH compton 1
 .SH NAME
-xcompmgr \- sample X compositing manager
+compton \- a compositor for X11
 .SH SYNOPSIS
 .nf
-.B xcompmgr [\-d display] [\-r radius] [\-o opacity] [\-l left-offset] [\-t top-offset] [\-acCfFnsS]
+.B compton [\-d display] [\-r radius] [\-o opacity] [\-l left-offset] [\-t top-offset] [\-i opacity] [\-e opacity] [\-cCfFS]
 .fi
 .SH DESCRIPTION
-.B xcompmgr
-is a sample compositing manager for X servers supporting the XFIXES, DAMAGE,
-and COMPOSITE extensions.  It enables basic eye-candy effects.
+.B compton
+is a compositor based on Dana Jansens' version of xcompmgr (which itself was
+written by Keith Packard). It includes many improvements over the original
+xcompmgr, including window frame opacity, inactive window transparency,
+and shadows on argb windows.
 .SH OPTIONS
 .TP
 .BI \-d\ display
@@ -25,7 +27,7 @@ Specifies the opacity for client-side shadows.
 Specifies the left offset for client-side shadows.
 .TP
 .BI \-t\ top-offset
-Specifies the top offset for client-side shadows. 
+Specifies the top offset for client-side shadows.
 .TP
 .BI \-I\ fade-in-step
 Specifies the opacity change between steps while fading in.
@@ -36,10 +38,6 @@ Specifies the opacity change between steps while fading out.
 .BI \-D\ fade-delta
 Specifies the time (in milliseconds) between steps in a fade.
 .TP
-.BI \-a
-Automatic server-side compositing.  This instructs the server to use the
-standard composition rules.  Useful for debugging.
-.TP
 .BI \-c
 Client-side compositing with soft shadows and translucency support.
 .TP
@@ -47,12 +45,6 @@ Client-side compositing with soft shadows and translucency support.
 When \-c is specified, enables a smooth fade effect for transient windows like
 menus, and for all windows on hide and restore events.
 .TP
-.BI \-n
-Simple client-side compositing.
-.TP
-.BI \-s
-Server-side compositing with hard-edged shadows.
-.TP
 .BI \-C
 When \-c is specified, attempts to avoid painting shadows on panels and docks.
 .TP
@@ -60,10 +52,18 @@ When \-c is specified, attempts to avoid painting shadows on panels and docks.
 When \-f is specified, also enables the fade effect when windows change their
 opacity, as with transset(1).
 .TP
+.BI \-i\ opacity
+Specifies inactive window transparency. (0.1 - 1.0)
+.TP
+.BI \-e\ opacity
+Specifies window frame transparency. (0.1 - 1.0)
+.TP
 .BI \-S
 Enables synchronous operation.  Useful for debugging.
 .SH BUGS
-Probably.  Please report any you find to http://bugs.freedesktop.org/.
+Probably.  Please report any you find to https://github.com/chjj/compton.
 .SH AUTHORS
-Keith Packard, with contributions from Matthew Allum, Eric Anholt, Dan Doel,
-Thomas Luebking, Matthew Hawn, Ely Levy, Phil Blundell, and Carl Worth.
+xcompmgr, Originally written by Keith Packard, with contributions from
+Matthew Allum, Eric Anholt, Dan Doel, Thomas Luebking, Matthew Hawn,
+Ely Levy, Phil Blundell, and Carl Worth.
+Compton by Christopher Jeffrey, based on Dana Jansens' original work.
diff --git a/xcompmgr.c b/compton.c
similarity index 100%
rename from xcompmgr.c
rename to compton.c
diff --git a/xcompmgr.h b/compton.h
similarity index 100%
rename from xcompmgr.h
rename to compton.h
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index bf9b404..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,29 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.57)
-AC_INIT([xcompmgr], [1.1.3], [xorg@freedesktop.org])
-AC_CONFIG_SRCDIR([xcompmgr.c])
-AM_INIT_AUTOMAKE([dist-bzip2 foreign])
-AM_MAINTAINER_MODE
-AC_CONFIG_HEADER([config.h])
-
-# Checks for programs.
-AC_PROG_CC
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([stdlib.h sys/time.h unistd.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_TIME
-AC_STRUCT_TM
-
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_CHECK_FUNCS([gettimeofday localtime_r])
-
-PKG_CHECK_MODULES(XCOMPMGR, xcomposite xfixes xdamage xrender)
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT