diff --git a/Makefile b/Makefile
index a8055f4..f73998c 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ all:
 	make make-ca-private-key
 	make make-Certificate-Authority-Certificate-file
 	cd farm && make all
+	cd client && make all
 	make create
 
 tag:
@@ -35,6 +36,7 @@ create:
 	cp Makefile debian/files/etc/pki/CA/
 	cp *.pem debian/files/etc/pki/CA/
 	cp farm/*.pem debian/files/etc/pki/CA/
+	cp client/*.pem debian/files/etc/pki/CA/
 	chmod 444 debian/files/etc/pki/CA/*.pem
 	cd debian/files/ && md5sum etc/pki/CA/* > ../DEBIAN/md5sum
 	cd debian/DEBIAN && tar --ignore-failed-read -cvJf ../control.tar.xz {post,pre}{inst,rm} md5sums control
@@ -47,15 +49,20 @@ clean:
 	rm -f *.deb
 	rm -rf debian/
 	cd farm && make clean
+	cd client && make clean
 
 farm01:
 	cp /etc/pki/CA/certificate_authority_certificate.pem /etc/pki/CA/cacert.pem
 	mkdir -p /etc/pki/libvirt/private/
 	cp /etc/pki/CA/farm01_server_certificate.pem /etc/pki/libvirt/servercert.pem
 	cp /etc/pki/CA/farm01_server_key.pem /etc/pki/libvirt/private/serverkey.pem
+	cp /etc/pki/CA/farm01_client_certificate.pem /etc/pki/libvirt/clientcert.pem
+	cp /etc/pki/CA/farm01_client_key.pem /etc/pki/libvirt/private/clientkey.pem
 
 farm02:
 	cp /etc/pki/CA/certificate_authority_certificate.pem /etc/pki/CA/cacert.pem
 	mkdir -p /etc/pki/libvirt/private/
 	cp /etc/pki/CA/farm02_server_certificate.pem /etc/pki/libvirt/servercert.pem
 	cp /etc/pki/CA/farm02_server_key.pem /etc/pki/libvirt/private/serverkey.pem
+	cp /etc/pki/CA/farm02_client_certificate.pem /etc/pki/libvirt/clientcert.pem
+	cp /etc/pki/CA/farm02_client_key.pem /etc/pki/libvirt/private/clientkey.pem
diff --git a/client/Makefile b/client/Makefile
new file mode 100644
index 0000000..6f1ac0d
--- /dev/null
+++ b/client/Makefile
@@ -0,0 +1,37 @@
+info:
+	echo "make all    # to actually make everything"
+
+all:
+	certtool --generate-privkey > farm01_client_key.pem
+	certtool --generate-privkey > farm02_client_key.pem
+	certtool --generate-privkey > admin_desktop_client_key.pem
+	make farm01-client
+	make farm02-client
+	make admin-client
+
+clean:
+	rm *.pem
+
+farm01-client:
+	certtool --generate-certificate \
+		--template farm01_client_template.info \
+		--load-privkey farm01_client_key.pem \
+		--load-ca-certificate ../certificate_authority_certificate.pem \
+		--load-ca-privkey ../certificate_authority_key.pem \
+		--outfile farm01_client_certificate.pem
+
+farm02-client:
+	certtool --generate-certificate \
+		--template farm02_client_template.info \
+		--load-privkey farm02_client_key.pem \
+		--load-ca-certificate ../certificate_authority_certificate.pem \
+		--load-ca-privkey ../certificate_authority_key.pem \
+		--outfile farm02_client_certificate.pem
+
+admin-client:
+	certtool --generate-certificate \
+		--template admin_desktop_client_template.info \
+		--load-privkey admin_desktop_client_key.pem \
+		--load-ca-certificate ../certificate_authority_certificate.pem \
+		--load-ca-privkey ../certificate_authority_key.pem \
+		--outfile admin_desktop_client_certificate.pem
diff --git a/client/admin_desktop_client_template.info b/client/admin_desktop_client_template.info
new file mode 100644
index 0000000..511a89e
--- /dev/null
+++ b/client/admin_desktop_client_template.info
@@ -0,0 +1,8 @@
+country = US
+state = Wisconsin
+locality = Madison
+organization = WIT.COM Inc.
+cn = wilddog
+tls_www_client
+encryption_key
+signing_key
diff --git a/client/farm01_client_template.info b/client/farm01_client_template.info
new file mode 100644
index 0000000..698837d
--- /dev/null
+++ b/client/farm01_client_template.info
@@ -0,0 +1,8 @@
+country = US
+state = Wisconsin
+locality = Madison
+organization = WIT.COM Inc.
+cn = farm01
+tls_www_client
+encryption_key
+signing_key
diff --git a/client/farm02_client_template.info b/client/farm02_client_template.info
new file mode 100644
index 0000000..efddc23
--- /dev/null
+++ b/client/farm02_client_template.info
@@ -0,0 +1,8 @@
+country = US
+state = Wisconsin
+locality = Madison
+organization = WIT.COM Inc.
+cn = farm02
+tls_www_client
+encryption_key
+signing_key