3 files changed, 11 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57529c2096df..3bdcd9a7c7a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = systemd-ssh-agent
 	pkgdesc = A systemd user unit for the ssh-agent service
 	pkgver = 1.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.archlinux.org/index.php/SSH_keys#Start_ssh-agent_with_systemd_user
 	install = ssh-agent.install
 	arch = any
 	license = GPL
+	conflicts = openssh
 	source = ssh-agent.service
 	source = ssh-auth-sock.sh
 	sha256sums = 5768bc9dd781f1a12229bcc1dacacd24569de1829d791cd0e8cc836a58702cec
 	sha256sums = c04f183ce1b97cb225aea1db2ae908dc70669066935717ea3d5b171bc10455a0
 
 pkgname = systemd-ssh-agent
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..13c6de59f46d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!ssh-agent.install
+!ssh-agent.service
+!ssh-auth-sock.sh
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index aaaaa861c6aa..a23cc064b1ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,11 +2,12 @@
 
 pkgname=systemd-ssh-agent
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A systemd user unit for the ssh-agent service"
 url="https://wiki.archlinux.org/index.php/SSH_keys#Start_ssh-agent_with_systemd_user"
 license=('GPL')
 arch=('any')
+conflicts=('openssh')
 install=ssh-agent.install
 source=('ssh-agent.service' 'ssh-auth-sock.sh')
 sha256sums=('5768bc9dd781f1a12229bcc1dacacd24569de1829d791cd0e8cc836a58702cec' 'c04f183ce1b97cb225aea1db2ae908dc70669066935717ea3d5b171bc10455a0')