21 files changed, 31 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6acb3f4..0ec2030 100755
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,10 @@ install: all installman
 	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
 	install src/monkeysphere src/keytrans/openpgp2ssh src/keytrans/pem2openpgp $(DESTDIR)$(PREFIX)/bin
 	install src/monkeysphere-host src/monkeysphere-authentication $(DESTDIR)$(PREFIX)/sbin
-	install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
-	install -m 0644 src/subcommands/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
-	install -m 0644 src/subcommands/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
-	install -m 0644 src/subcommands/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
+	install -m 0644 src/share/common $(DESTDIR)$(PREFIX)/share/monkeysphere
+	install -m 0644 src/share/m/* $(DESTDIR)$(PREFIX)/share/monkeysphere/m
+	install -m 0644 src/share/mh/* $(DESTDIR)$(PREFIX)/share/monkeysphere/mh
+	install -m 0644 src/share/ma/* $(DESTDIR)$(PREFIX)/share/monkeysphere/ma
 	install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
 	install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX)
 	install -m 0644 etc/monkeysphere-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-host.conf$(ETCSUFFIX)
diff --git a/man/man1/pem2openpgp.1 b/man/man1/pem2openpgp.1
new file mode 100644
index 0000000..8ac230b
--- /dev/null
+++ b/man/man1/pem2openpgp.1
@@ -0,0 +1,27 @@
+.\"  -*- nroff -*-
+.Dd $Mdocdate: January 25, 2009 $
+.Dt PEM2OPENPGP 1
+.Os
+.Sh NAME
+pem2openpgp
+.Nd translate PEM encoded keys to OpenPGP keys
+.Sh SYNOPSIS
+.Nm pem2openpgp $USERID < mykey.pem 
+.Pp
+.Nm ??? gpg --export $KEYID | openpgp2ssh $KEYID
+.Pp
+.Nm ????gpg --export-secret-key $KEYID | openpgp2ssh $KEYID
+.Sh DESCRIPTION
+.Nm
+WRITE ME!!!
+.Sh AUTHOR
+.Nm
+and this man page were written by Daniel Kahn Gillmor
+<dkg@fifthhorseman.net>.
+.Sh BUGS
+.Sh SEE ALSO
+.Xr openpgp2ssh 1,
+.Xr monkeysphere 1 ,
+.Xr monkeysphere 7 ,
+.Xr ssh 1 ,
+.Xr monkeysphere-server 8
diff --git a/src/common b/src/share/common
index ef931ca..ef931ca 100644
--- a/src/common
+++ b/src/share/common
diff --git a/src/subcommands/m/gen_subkey b/src/share/m/gen_subkey
index cbefaa3..cbefaa3 100644
--- a/src/subcommands/m/gen_subkey
+++ b/src/share/m/gen_subkey
diff --git a/src/subcommands/m/import_subkey b/src/share/m/import_subkey
index aa89958..aa89958 100644
--- a/src/subcommands/m/import_subkey
+++ b/src/share/m/import_subkey
diff --git a/src/subcommands/m/ssh_proxycommand b/src/share/m/ssh_proxycommand
index 7239c7a..7239c7a 100644
--- a/src/subcommands/m/ssh_proxycommand
+++ b/src/share/m/ssh_proxycommand
diff --git a/src/subcommands/m/subkey_to_ssh_agent b/src/share/m/subkey_to_ssh_agent
index 012c95f..012c95f 100644
--- a/src/subcommands/m/subkey_to_ssh_agent
+++ b/src/share/m/subkey_to_ssh_agent
diff --git a/src/subcommands/ma/add_certifier b/src/share/ma/add_certifier
index 0c3c647..0c3c647 100644
--- a/src/subcommands/ma/add_certifier
+++ b/src/share/ma/add_certifier
diff --git a/src/subcommands/ma/diagnostics b/src/share/ma/diagnostics
index 73e93a0..73e93a0 100644
--- a/src/subcommands/ma/diagnostics
+++ b/src/share/ma/diagnostics
diff --git a/src/subcommands/ma/list_certifiers b/src/share/ma/list_certifiers
index e37485e..e37485e 100644
--- a/src/subcommands/ma/list_certifiers
+++ b/src/share/ma/list_certifiers
diff --git a/src/subcommands/ma/remove_certifier b/src/share/ma/remove_certifier
index 560281d..560281d 100644
--- a/src/subcommands/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
diff --git a/src/subcommands/ma/update_users b/src/share/ma/update_users
index 73685f6..73685f6 100644
--- a/src/subcommands/ma/update_users
+++ b/src/share/ma/update_users
diff --git a/src/subcommands/mh/add_hostname b/src/share/mh/add_hostname
index 10d5f58..10d5f58 100644
--- a/src/subcommands/mh/add_hostname
+++ b/src/share/mh/add_hostname
diff --git a/src/subcommands/mh/add_revoker b/src/share/mh/add_revoker
index f9d0bb6..f9d0bb6 100644
--- a/src/subcommands/mh/add_revoker
+++ b/src/share/mh/add_revoker
diff --git a/src/subcommands/mh/diagnostics b/src/share/mh/diagnostics
index 7e76da6..7e76da6 100644
--- a/src/subcommands/mh/diagnostics
+++ b/src/share/mh/diagnostics
diff --git a/src/subcommands/mh/extend_key b/src/share/mh/extend_key
index ccbaf0e..ccbaf0e 100644
--- a/src/subcommands/mh/extend_key
+++ b/src/share/mh/extend_key
diff --git a/src/subcommands/mh/gen_key b/src/share/mh/gen_key
index aad213a..aad213a 100644
--- a/src/subcommands/mh/gen_key
+++ b/src/share/mh/gen_key
diff --git a/src/subcommands/mh/import_key b/src/share/mh/import_key
index 386e02d..386e02d 100644
--- a/src/subcommands/mh/import_key
+++ b/src/share/mh/import_key
diff --git a/src/subcommands/mh/publish_key b/src/share/mh/publish_key
index b7ab01d..b7ab01d 100644
--- a/src/subcommands/mh/publish_key
+++ b/src/share/mh/publish_key
diff --git a/src/subcommands/mh/revoke_hostname b/src/share/mh/revoke_hostname
index b519cf6..b519cf6 100644
--- a/src/subcommands/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
diff --git a/src/subcommands/mh/revoke_key b/src/share/mh/revoke_key
index cccdc22..cccdc22 100644
--- a/src/subcommands/mh/revoke_key
+++ b/src/share/mh/revoke_key