diff --git a/x11/Makefile b/x11/Makefile
index c614983277e6..99bd5a6a134c 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -142,6 +142,7 @@
     SUBDIR += numlockx
     SUBDIR += nvidia-driver
     SUBDIR += nvidia-settings
+    SUBDIR += nvidia-xconfig
     SUBDIR += offix-clipboard
     SUBDIR += offix-execute
     SUBDIR += oooqs
diff --git a/x11/nvidia-xconfig/Makefile b/x11/nvidia-xconfig/Makefile
new file mode 100644
index 000000000000..5baeda6d75a6
--- /dev/null
+++ b/x11/nvidia-xconfig/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:	nvidia-xconfig
+# Date created:				10 Dec 2005
+# Whom:					Alexander Nedotsukov <bland@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	nvidia-xconfig
+PORTVERSION=	1.0
+CATEGORIES=	x11
+MASTER_SITES=	http://download.nvidia.com/XFree86/nvidia-xconfig/ \
+		${MASTER_SITE_LOCAL:S/$/:local/}
+MASTER_SITE_SUBDIR=     bland/:local
+
+MAINTAINER=	bland@FreeBSD.org
+COMMENT=	Tool to manipulate X configuration files for the NVidia driver
+
+USE_GMAKE=	yes
+
+MAKE_ENV=	ROOT=${PREFIX} \
+		CC=${CC}
+
+MAN1=		nvidia-xconfig.1
+PLIST_FILES=	bin/nvidia-xconfig
+
+.include <bsd.port.mk>
diff --git a/x11/nvidia-xconfig/distinfo b/x11/nvidia-xconfig/distinfo
new file mode 100644
index 000000000000..6be08c872e7f
--- /dev/null
+++ b/x11/nvidia-xconfig/distinfo
@@ -0,0 +1,3 @@
+MD5 (nvidia-xconfig-1.0.tar.gz) = d69e965228645a72857053fa5f422b39
+SHA256 (nvidia-xconfig-1.0.tar.gz) = 60264f00d2ac4154d94f9e40cd28f4ea12808f25a08ebf267f0d3d4893d2efa1
+SIZE (nvidia-xconfig-1.0.tar.gz) = 87294
diff --git a/x11/nvidia-xconfig/files/patch-Makefile b/x11/nvidia-xconfig/files/patch-Makefile
new file mode 100644
index 000000000000..29fdce775392
--- /dev/null
+++ b/x11/nvidia-xconfig/files/patch-Makefile
@@ -0,0 +1,45 @@
+--- Makefile.orig	Wed Nov 23 11:58:16 2005
++++ Makefile	Sat Dec 10 17:21:45 2005
+@@ -56,12 +56,11 @@
+   CFLAGS += -g -DDEBUG
+ else
+   STRIP = strip
+-  CFLAGS += -O
+ endif
+ 
+ # default prefix
+ ifdef ROOT
+-  prefix = $(ROOT)/usr
++  prefix = $(ROOT)
+ else
+   prefix = /usr/local
+ endif
+@@ -80,17 +79,15 @@
+ else
+ ECHO=echo
+ define INSTALL_RULE
+-	$(INSTALL) -m 755 $< $(bindir)
+-	mkdir -p $(mandir)
+-	$(INSTALL) -m 644 $(MANPAGE) $(mandir)
+-	gzip -9f $(mandir)/$(MANPAGE)
++	$(BSD_INSTALL_PROGRAM) $< $(bindir)
++	$(BSD_INSTALL_MAN) $(MANPAGE) $(mandir)
+ endef
+ LLSCF=
+ endif
+ 
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+-mandir = $(exec_prefix)/share/man/man1
++mandir = $(MANPREFIX)/man/man1
+ 
+ NVIDIA_XCONFIG = nvidia-xconfig
+ NVIDIA_XCONFIG_VERSION = 1.0
+@@ -145,7 +142,6 @@
+ all: $(NVIDIA_XCONFIG) $(MANPAGE)
+ 
+ install: $(NVIDIA_XCONFIG)
+-	$(STRIP) $<
+ 	$(INSTALL_RULE)
+ 
+ $(NVIDIA_XCONFIG): $(OBJS) $(LIB)
diff --git a/x11/nvidia-xconfig/pkg-descr b/x11/nvidia-xconfig/pkg-descr
new file mode 100644
index 000000000000..4720277fe7b8
--- /dev/null
+++ b/x11/nvidia-xconfig/pkg-descr
@@ -0,0 +1,4 @@
+The `nvidia-xconfig` is a tool intended to provide basic control over
+configuration options available in the NVIDIA X driver.
+
+WWW: http://www.nvidia.com/object/unix.html