diff --git a/GIDs b/GIDs
index aad4533cfb91..2699f7b1ba31 100644
--- a/GIDs
+++ b/GIDs
@@ -243,6 +243,7 @@ sogod:*:846:
 fossy:*:901:www
 scanlogd:*:902:
 _ocserv:*:903:
+opentsdb:*:906:
 influxd:*:907:
 riemann:*:908:
 proxy65:*:909:
diff --git a/UIDs b/UIDs
index b093559e3213..d47a62e1a215 100644
--- a/UIDs
+++ b/UIDs
@@ -251,6 +251,7 @@ sogod:*:846:846::0:0:SOGo groupware:/nonexistent:/usr/sbin/nologin
 fossy:*:901:901::0:0:FOSSology user:/usr/local/share/fossology:/usr/local/bin/bash
 scanlogd:*:902:902::0:0:scanlogd user:/nonexistent:/usr/sbin/nologin
 _ocserv:*:903:903::0:0:ocserv user:/nonexistent:/usr/sbin/nologin
+opentsdb:*:906:906::0:0:OpenTSDB Daemon:/var/empty:/usr/sbin/nologin
 influxd:*:907:907::0:0:InfluxDB Daemon:/var/empty:/usr/sbin/nologin
 riemann:*:908:908::0:0:Riemann User:/var/empty:/usr/sbin/nologin
 proxy65:*:909:909::0:0:Proxy65 Daemon:/nonexistent:/usr/sbin/nologin
diff --git a/databases/opentsdb/files/patch-Makefile.in b/databases/opentsdb/files/patch-Makefile.in
index 35542639b5d3..4d71c200db5c 100644
--- a/databases/opentsdb/files/patch-Makefile.in
+++ b/databases/opentsdb/files/patch-Makefile.in
@@ -5,10 +5,19 @@
  # in the script before it gets installed...
  install-exec-hook:
 -	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(pkgdatadir)/etc/opentsdb'; \
-+	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='/usr/local/etc/opentsdb'; \
++	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/etc/opentsdb'; \
            abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
  	cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"
  	rm -f tsdb.tmp
+@@ -1442,7 +1442,7 @@ gwtc: .gwtc-stamp
+ 	@$(mkdir_p) gwt
+ 	{ cd $(srcdir) && cat $(httpui_SRC); } | $(MD5) >"$@-t"
+ 	cmp -s "$@" "$@-t" && exit 0; \
+-        $(JAVA) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \
++        $(JAVA) -Djava.util.prefs.userRoot=$(HOME) $(GWTC_JVM_ARGS) -cp $(GWT_CLASSPATH) com.google.gwt.dev.Compiler \
+             $(GWTC_ARGS) -war gwt tsd.QueryUi
+ 	@mv "$@-t" "$@"
+ gwtdev: .gwtc-stamp
 @@ -1468,7 +1468,7 @@ gwttsd: staticroot
  # how to tell it to install a bunch of files recursively for which I don't
  # know ahead of time what the file names are.