diff --git a/.gitignore b/.gitignore
index b24a058..f6321fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
+Makefile
+CMakeCache.txt
+cmake_install.cmake
+CMakeFiles
+libmultichoose.a
 multichoose
+multipermute
 cmultichoose
-tad
-.*swp
-*.pyc
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..d40fd98
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 2.8)
+
+add_library(multichoose
+	multichoose.cpp
+	multipermute.cpp
+)
+
+add_executable(multichoose-bin
+	multichoose.cpp
+)
+
+set_target_properties(multichoose-bin
+	PROPERTIES OUTPUT_NAME multichoose
+)
+
+add_executable(multipermute
+	multipermute.cpp
+)
+
+add_executable(cmultichoose
+	multichoose.c
+)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 04e6cab..0000000
--- a/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-all: multichoose multipermute
-
-#multichoose_recursive: multichoose_recursive.cpp
-#	g++ multichoose_recursive.cpp -o multichoose_recursive
-
-multichoose: multichoose.cpp multichoose.h
-	g++ multichoose.cpp -o multichoose
-
-multipermute: multipermute.cpp multipermute.h
-	g++ multipermute.cpp -o multipermute
-
-cmultichoose: multichoose.c
-	gcc multichoose.c -o cmultichoose
-
-clean:
-	rm cmultichoose
-	rm multichoose
diff --git a/README b/README
index 605eeb4..e99b25f 100644
--- a/README
+++ b/README
@@ -8,6 +8,7 @@ This is a small C++ library/program which contains a generic function to
 generate multisets for vectors of any type of object.  You can test out the
 program using strings input from the command line by typing:
 
+	% cmake .
     % make
 
 Running: