diff --git a/tlp.spec b/tlp.spec
index d774a79..fc7cd2d 100644
--- a/tlp.spec
+++ b/tlp.spec
@@ -20,7 +20,6 @@ Requires:	pm-utils
 #Conflicts with laptop-mode-tools, note that an official
 #package/package name doesn't exist, so this works for now:
 Conflicts:      %{_sbindir}/laptop_mode
-BuildArch:      noarch
 
 %description
 TLP brings you the benefits of advanced power management for Linux
@@ -47,6 +46,10 @@ sed -i 's|/lib/udev|/usr/lib/udev|g' tlp*rules Makefile
 sed -i 's|etc/bash_completion.d|usr/share/bash-completion/completions|g' Makefile
 #Fix init script location
 sed -i 's|/etc/init.d/tlp|/etc/rc.d/init.d/tlp|g' Makefile
+#Fix Libdir if 64bit
+%ifarch x86_64 amd64
+sed -i 's|TLP_LIBDIR ?= /usr/lib|TLP_LIBDIR ?= /usr/lib64|g' Makefile
+%endif
 
 %build
 make
@@ -68,9 +71,7 @@ install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_presetdir}/50-tlp.preset
 %{_bindir}/*
 %{_sbindir}/*
 %{_mandir}/man*/*
-#Explicit use of lib is required, see "Libexecdir"/"Multilib Exempt Locations":
-#https://fedoraproject.org/wiki/Packaging:Guidelines#Filesystem_Layout
-%{_prefix}/lib/tlp-pm
+%{_libdir}/tlp-pm
 %{_libdir}/pm-utils/sleep.d/49tlp
 /usr/lib/udev/rules.d/40-tlp.rules
 /usr/lib/udev/tlp-usb-udev