diff --git a/.abf.yml b/.abf.yml
index 0b3b966..fd4ae62 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  "lld-6.0.0.src.tar.xz": 983f3bcbf289991cf8580256851c379ec7687e71
+  lld-6.0.0.src.tar.xz: 983f3bcbf289991cf8580256851c379ec7687e71
diff --git a/lld.spec b/lld.spec
index 112065e..1665687 100644
--- a/lld.spec
+++ b/lld.spec
@@ -1,121 +1,74 @@
+%define major 6
+%define libname %mklibname %{name} %{major}
+%define devname %mklibname %{name} -d
+
+Summary:	The LLVM Linker
 Name:		lld
 Version:	6.0.0
-Release:	1%{?dist}
-Summary:	The LLVM Linker
-
+Release:	1
+Group:		Development/Other
 License:	NCSA
-URL:		http://llvm.org
-Source0:	http://llvm.org/releases/%{version}/lld-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz
-
-BuildRequires: cmake
-BuildRequires: llvm-devel = %{version}
-BuildRequires: ncurses-devel
-BuildRequires: zlib-devel
-BuildRequires: chrpath
+Url:		http://llvm.org
+Source0:	http://releases.llvm.org/%{version}/%{name}-%{version}.src.tar.xz
+BuildRequires:	cmake
+BuildRequires:	llvm-devel = %{version}
+BuildRequires:	ncurses-devel
+BuildRequires:	zlib-devel
 
 %description
 The LLVM project linker.
 
-%package devel
-Summary:	Libraries and header files for LLD
-
-%description devel
-This package contains library and header files needed to develop new native
-programs that use the LLD infrastructure.
-
-%package libs
-Summary:	LLD shared libraries
-
-%description libs
-Shared libraries for LLD.
-
-%prep
-%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1
-
-%build
-
-mkdir %{_target_platform}
-cd %{_target_platform}
-
-%cmake .. \
-	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
-	-DLLVM_DYLIB_COMPONENTS="all" \
-%if 0%{?__isa_bits} == 64
-	-DLLVM_LIBDIR_SUFFIX=64
-%else
-	-DLLVM_LIBDIR_SUFFIX=
-%endif
-
-%make_build
-
-%install
-cd %{_target_platform}
-%make_install
-
-# Remove rpath
-chrpath --delete %{buildroot}%{_bindir}/*
-chrpath --delete %{buildroot}%{_libdir}/*.so*
-
-%check
-# Need to install llvm utils for check to pass
-#cd _build
-#make %{?_smp_mflags} check-lld
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
 %files
+%doc LICENSE.TXT
 %{_bindir}/lld*
 %{_bindir}/ld.lld
 %{_bindir}/ld64.lld
 %{_bindir}/wasm-ld
 
-%files devel
+#-------------------------------------------------------------------------
+
+%package -n %{libname}
+Summary:	LLD shared libraries
+Group:		System/Libraries
+
+%description -n %{libname}
+Shared libraries for LLD.
+
+%files -n %{libname}
+%doc LICENSE.TXT
+%{_libdir}/lib%{name}*.so.%{major}*
+#-------------------------------------------------------------------------
+
+%package -n %{devname}
+Summary:	Libraries and header files for LLD
+Group:		Development/Other
+Requires:	%{libname} = %{EVRD}
+Provides:	%{name}-devel = %{EVRD}
+
+%description -n %{devname}
+This package contains library and header files needed to develop new native
+programs that use the LLD infrastructure.
+
+%files -n %{devname}
+%doc LICENSE.TXT
 %{_includedir}/lld
 %{_libdir}/liblld*.so
+#-------------------------------------------------------------------------
 
-%files libs
-%{_libdir}/liblld*.so.*
+%prep
+%setup -qn %{name}-%{version}.src
 
-%changelog
-* Thu Mar 08 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-1
-- 6.0.0 Release
+%build
+%cmake \
+	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
+	-DLLVM_DYLIB_COMPONENTS="all" \
+%ifarch x86_64
+	-DLLVM_LIBDIR_SUFFIX=64
+%else
+	-DLLVM_LIBDIR_SUFFIX=
+%endif
 
-* Tue Feb 13 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.3.rc2
-- 6.0.0-rc2 Release
+%make -s
 
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-0.2.rc1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 25 2018 Tom Stellard <tstellar@redhat.com> - 6.0.0-0.1.rc1
-- 6.0.0-rc1 Release
-
-* Thu Dec 21 2017 Tom Stellard <tstellar@redhat.com> - 5.0.1-1
-- 5.0.1 Release
-
-* Mon Sep 11 2017 Tom Stellard <tstellar@redhat.com> - 5.0.0-1
-- 5.0.0 Release
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Thu Jul 06 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-2
-- Backport r307092
-
-* Tue Jul 04 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-1
-- 4.0.1 Release
-
-* Tue Jul 04 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-4
-- Fix build without llvm-static
-
-* Wed May 31 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-3
-- Remove llvm-static dependency
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Tue Mar 14 2017 Tom Stellard <tstellar@redhat.com> - 4.0.0-1
-- lld 4.0.0 Final Release
+%install
+%makeinstall_std -C build