diff --git a/xcalib/PKGBUILD b/xcalib/PKGBUILD
new file mode 100644
index 000000000..7ac73df68
--- /dev/null
+++ b/xcalib/PKGBUILD
@@ -0,0 +1,33 @@
+# Part of the X.org group
+# Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
+
+pkgname=xcalib
+pkgver=0.8
+pkgrel=2
+pkgdesc="A tiny monitor calibration loader for X.org"
+arch=(x86_64)
+url="http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/"
+license=('GPL')
+depends=(libx11 libxext libxxf86vm xf86vidmodeproto)
+source=(http://downloads.sourceforge.net/xcalib/xcalib-source-$pkgver.tar.gz \
+        makefile-ldflags.patch)
+md5sums=('1fbcae44ad8d754512fdd1e5f1b3a7e7'
+         'fd3aa535f50234ee7d46494913abc1a7')
+
+prepare() {
+  cd ${srcdir}/$pkgname-$pkgver
+  patch -p0 < ../makefile-ldflags.patch
+}
+
+  build() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  install -D -m755 xcalib ${pkgdir}/usr/bin/xcalib
+  
+  mkdir -p ${pkgdir}/usr/share/xcalib
+  cp README  *.icc *.icm  ${pkgdir}/usr/share/xcalib
+}
diff --git a/xcalib/makefile-ldflags.patch b/xcalib/makefile-ldflags.patch
new file mode 100644
index 000000000..2a9b6715e
--- /dev/null
+++ b/xcalib/makefile-ldflags.patch
@@ -0,0 +1,11 @@
+--- Makefile	2005-08-24 08:17:13.000000000 +0200
++++ Makefile.ok	2007-05-17 16:05:14.000000000 +0200
+@@ -58,7 +58,7 @@
+ # low overhead version (internal parser)
+ lo_xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\"
+-	$(CC) $(CFLAGS) -L$(XLIBDIR) -lm -o xcalib xcalib.o -lX11 -lXxf86vm -lXext
++	$(CC) $(LDFLAGS) -L$(XLIBDIR) -o xcalib xcalib.o -lm -lX11 -lXxf86vm -lXext
+ 
+ fglrx_xcalib: xcalib.c
+ 	$(CC) $(CFLAGS) -c xcalib.c -I$(XINCLUDEDIR) -DXCALIB_VERSION=\"$(XCALIB_VERSION)\" -I$(FGLRXINCLUDEDIR) -DFGLRX