diff --git a/srcpkgs/nx-libs-devel b/srcpkgs/nx-libs-devel
new file mode 120000
index 00000000000..3aefdeffb22
--- /dev/null
+++ b/srcpkgs/nx-libs-devel
@@ -0,0 +1 @@
+nx-libs
\ No newline at end of file
diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
index e0b01308bc9..f604983c82c 100644
--- a/srcpkgs/nx-libs/template
+++ b/srcpkgs/nx-libs/template
@@ -1,9 +1,12 @@
 # Template file for 'nx-libs'
 pkgname=nx-libs
 version=3.5.99.26
-revision=1
+revision=2
 build_style=gnu-configure
-make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES"
+# The rpath for nxagent is USRLIBDIRPATH, which must be where this package
+# provides a symlink to the custom libX11 with NX features
+make_build_args='CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES
+ USRLIBDIRPATH=\$$ORIGIN/../lib/nx/X11'
 make_install_args="PREFIX=/usr"
 hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp gccmakedep"
 makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel
@@ -11,13 +14,14 @@ makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel
  libXfont2-devel libxml2-devel libXcomposite-devel libXinerama-devel
  libtirpc-devel libXpm-devel font-util xkbcomp"
 short_desc="NX X11 protocol compression libraries"
-maintainer="eoli3n <jkirsz@gmail.com>"
+maintainer="eoli3n <jonathan.kirszling@runbox.com>"
 license="GPL-2.0-or-later"
 homepage="https://github.com/ArcticaProject/nx-libs"
-distfiles="https://github.com/ArcticaProject/nx-libs/archive/$version/$pkgname-$version.tar.gz"
+distfiles="${homepage}/archive/$version/$pkgname-$version.tar.gz"
 checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357
 python_version=3
 nocross="imake attempts to run target executables on host"
+conf_files="/etc/nxagent/*"
 
 post_patch() {
 	# Replace hard-coded /usr/local ProjectRoot
@@ -50,7 +54,7 @@ post_install() {
 	rm -rf ${DESTDIR}/usr/include/GL
 }
 
-nx-libs-devel_install() {
+nx-libs-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {