diff --git a/authd-1.4.3-docdir.patch b/authd-1.4.3-docdir.patch
new file mode 100644
index 0000000..90abd45
--- /dev/null
+++ b/authd-1.4.3-docdir.patch
@@ -0,0 +1,15 @@
+diff -up authd-1.4.3/GNUmakefile.docdir authd-1.4.3/GNUmakefile
+--- authd-1.4.3/GNUmakefile.docdir	2013-08-05 10:32:51.127926469 +0200
++++ authd-1.4.3/GNUmakefile	2013-08-05 10:38:32.434457096 +0200
+@@ -31,9 +31,9 @@ clean:
+ 
+ .PHONY: install
+ install: $(targets)
+-	install -d $(sbindir) $(datadir)/doc/$(PROJECT_ID)
++	install -d $(sbindir) $(datadir)/doc/$(PACKAGE)
+ 	install in.authd $(sbindir)
+-	install -m 644 $(docs) $(datadir)/doc/$(PROJECT_ID)
++	install -m 644 $(docs) $(datadir)/doc/$(PACKAGE)
+ 	for file in *.mo; \
+ 	do dir=$(datadir)/locale/$$(basename $${file} .mo)/LC_MESSAGES; \
+ 	   install -d $${dir}; \
diff --git a/authd-1.4.3-negative_uid.patch b/authd-1.4.3-negative_uid.patch
new file mode 100644
index 0000000..bd97ab2
--- /dev/null
+++ b/authd-1.4.3-negative_uid.patch
@@ -0,0 +1,47 @@
+--- authd.c.orig	2013-07-25 09:31:23.000000000 +0100
++++ authd.c	2013-07-17 11:59:53.000000000 +0100
+@@ -381,6 +381,23 @@
+     return ul;
+ }
+ 
++static long get_tok_int(char *s, unsigned base) {
++
++    long l = LONG_MAX;
++
++    assert(base <= 36);
++    if ((s = strtok(s, DELIM)) != NULL) {
++        char *endptr;
++
++        l = strtol(s, &endptr, (int) base);
++        if (l > INT_MAX || is_bad_strto(s, endptr))
++            errno = EINVAL;
++    }
++    else errno = EINVAL;
++    return l;
++}
++
++
+ static void destroy_opt(void) {
+     free(opt.codeset); free(opt.Encrypt); free(opt.ident); free(opt.lang);
+     free(opt.Noident); free(opt.os); free(opt.passwd); free(opt.mapped);
+@@ -603,7 +620,9 @@
+ static const char *const TEXT_READ_MODE = "r"; // passphrase, /proc plaintext
+ 
+ static bool get_info(reply_t *out, request_t in, const char *tcpname) {
+-    unsigned long lport, rport, uid, status; FILE *stream;
++    //unsigned long lport, rport, uid, status; FILE *stream;
++    unsigned long lport, rport, status; FILE *stream;
++    long uid;
+     const unsigned long ESTABLISHED = 0x01;
+     unsigned lineno = 0;
+     char *laddr = NULL, *raddr = NULL;
+@@ -675,7 +694,8 @@
+         (void) get_tok_uint(NULL, 16);            // tr (boolean)
+         (void) get_tok_ullong(NULL, 16);            // tm->when (unit: jiffies)
+         strtok(NULL, DELIM);                      // retrnsmt
+-        uid = get_tok_uint(NULL, 10);             // uid (base 10 uint)
++        //uid = get_tok_uint(NULL, 10);             // uid (base 10 uint)
++        uid = get_tok_int(NULL, 10);             // uid (base 10 int)
+         strtok(NULL, DELIM);                      // timeout
+         inode = get_tok_uint(NULL, 10);           // inode (base 10 uint)
+         if (errno == EINVAL) {
diff --git a/authd.spec b/authd.spec
index 0132c1a..a70a93d 100644
--- a/authd.spec
+++ b/authd.spec
@@ -1,7 +1,7 @@
 Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 39%{?dist}
+Release: 40%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: https://fedorahosted.org/authd/
@@ -19,6 +19,8 @@ Patch4: authd-1.4.3-longopt-identifier.patch
 Patch5: authd-1.4.3-jiffies64.patch
 Patch6: authd-1.4.3-valist.patch
 Patch7: authd-1.4.3-license.patch
+Patch8: authd-1.4.3-docdir.patch
+Patch9: authd-1.4.3-negative_uid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel gettext help2man systemd-units
 Requires(post): systemd-units
@@ -41,6 +43,8 @@ of pidentd.
 %patch5 -p1 -b .jiffies64
 %patch6 -p1 -b .valist
 %patch7 -p1 -b .license
+%patch8 -p1 -b .docdir
+%patch9 -p0 -b .negative_uid
 sed -i -e "s|/etc|%{_sysconfdir}|" config.h
 
 %build
@@ -89,6 +93,11 @@ chmod o-rw %{_sysconfdir}/ident.key
 %{_unitdir}/*
 
 %changelog
+* Mon Aug 05 2013 Roman Rakus <rrakus@redhat.com> - 1.4.3-40
+- Fix doc dir to satisfy new policy
+- Don't return negative uid
+  Resolves: #991998, #482811
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.3-39
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild