diff --git a/galaxy/ecrypt b/galaxy/ecrypt
index 613eff9..a917ba8 100644
--- a/galaxy/ecrypt
+++ b/galaxy/ecrypt
@@ -16,7 +16,7 @@ SHA256SUMS="8189477777d400de69bec363ec3e405db545941edf319e8e14ce99605dcf620d"
 
 # Dependency information
 DEPENDS=("")
-CONFLICTS=("")
+CONFLICTS=("ecrypt-rtc")
 
 # Source information
 PACKAGE_SRC="https://git.everestlinux.org/EverestLinux/ecrypt"
diff --git a/galaxy/pm b/galaxy/pm
new file mode 100644
index 0000000..2903532
--- /dev/null
+++ b/galaxy/pm
@@ -0,0 +1,67 @@
+#
+# pm
+#
+
+# Package metadata
+PACKAGE_NAME="pm"
+PACKAGE_VER="1.0"
+PACKAGE_DESC="Simple password manager"
+MAINTAINER="liamwaldron@everestlinux.org"
+LICENSE="GPL v3"
+ARCH="x86"
+INCLUDED_FILES=("/usr/bin/pm" "/etc/pm/entries")
+
+# Integrity checking
+SHA256SUMS="8189477777d400de69bec363ec3e405db545941edf319e8e14ce99605dcf620d"
+
+# Dependency information
+DEPENDS=("ecrypt")
+CONFLICTS=("pm-rtc")
+
+# Source information
+PACKAGE_SRC="https://git.everestlinux.org/EverestLinux/pm"
+SOURCES=("pm")
+
+# Installation
+getsource() {
+	git clone $PACKAGE_SRC
+	cd ${SOURCES}
+}
+
+buildpkg() {
+	make ${MAKEFLAGS} ${CFLAGS} ${CXXFLAGS} # these MUST be set
+}
+
+installpkg() {
+	make install
+	# Never install files to /bin, they will get
+	# overwritten when the user pulls a new update
+}
+
+installpkg_system() {
+	PREFIX="/" make install
+}
+
+removepkg() {
+	rm /usr/bin/pm
+	rm -rf /usr/share/man/man1/pm.1.gz
+}
+
+removepkg_system() {
+	rm /bin/pm
+	rm -rf /share/man/man1/pm.1.gz
+}
+
+updatepkg() {
+	buildpkg "$@"
+	installpkg "$@"
+}
+
+updatepkg_system() {
+	buildpkg "$@"
+	installpkg_system "$@"
+}
+
+#
+# end pm
+#