diff --git a/ed.changes b/ed.changes
index 31a0d94..c3de44e 100644
--- a/ed.changes
+++ b/ed.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  3 15:02:12 UTC 2012 - rschweikert@suse.com
+
+- switch license to spdx format
+- keep executable in /usr (UsrMerge project)
+
 -------------------------------------------------------------------
 Mon Jan  2 15:16:42 UTC 2012 - dlovasko@suse.com
 
diff --git a/ed.spec b/ed.spec
index ca0bce2..d33f67a 100644
--- a/ed.spec
+++ b/ed.spec
@@ -17,7 +17,7 @@
 
 Name:           ed
 Url:            http://www.gnu.org/software/ed/
-License:        GPLv3+ ; LGPLv2.1+
+License:        GPL-3.0+ ; LGPL-2.1+
 Group:          Productivity/Editors/Other
 PreReq:         %install_info_prereq
 Version:        1.6
@@ -42,9 +42,10 @@ make %{?_smp_mflags}
 
 %install
 %{makeinstall}
+#UsrMerge
 %{__install} -d -m 0755 %{buildroot}/bin
-%{__mv} %{buildroot}/%{_bindir}/ed %{buildroot}/bin/ed
-%{__ln_s} /bin/ed %{buildroot}/%{_bindir}/ed
+%{__ln_s} %{_bindir}/ed %{buildroot}/bin/ed
+#UsrMerge
 
 %check
 make check