diff --git a/freecad.spec b/freecad.spec
index d1c3ea2..b2bb369 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -6,7 +6,6 @@ License: GPL and LGPL
 Group: Graphics
 URL: http://free-cad.sourceforge.net/
 Source0: http://dfn.dl.sourceforge.net/sourceforge/free-cad/freecad-%{version}.tar.gz
-#Patch0: freecad-0.10.3247-fix-link.patch
 BuildRequires: gstreamer0.10-devel
 BuildRequires: qt4-devel
 BuildRequires: libxerces-c-devel
@@ -48,17 +47,36 @@ neither are animation and organic shapes
 
 %prep
 %setup -q 
-# -n FreeCAD-%{version}
-#%patch0 -p0
 
 %build
 %define Werror_cflags %nil
-%cmake_qt4
+%cmake_qt4 -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
+	    -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
+            -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
+            -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
+            -DRESOURCEDIR=%{_libdir}/freecad
 %make
 
 %install
 %makeinstall_std -C build
 
+# Symlink binaries to /usr/bin
+mkdir -p %{buildroot}%{_bindir}
+pushd %{buildroot}%{_bindir}
+ln -s ../%{_lib}/freecad/bin/FreeCAD .
+ln -s ../%{_lib}/freecad/bin/FreeCADCmd .
+popd
+
 %files
-%doc ChangeLog.txt copying.lib README.Linux
-%{_prefix}/lib/%{name}
+%doc ChangeLog.txt copying.lib data/License.txt build/doc/*
+%{_bindir}/*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_libdir}/%{name}/bin/
+%{_libdir}/%{name}/lib/
+%{_libdir}/%{name}/Mod/
+%{_datadir}/%{name}/
+%{_mandir}/man1/*.1.gz
+
+%files devel
+%{_includedir}/*