diff --git a/maven-script b/maven-script
index 5ee3af3..e4ac861 100644
--- a/maven-script
+++ b/maven-script
@@ -17,4 +17,4 @@ if [ -f /usr/share/java-utils/java-functions ] ; then
 fi
 
 export M2_HOME="${M2_HOME:-/usr/share/maven}"
-export JAVA_HOME; $M2_HOME/bin/mvn "$@"
+export JAVA_HOME; $M2_HOME/bin/@@CMD@@ "$@"
diff --git a/maven.spec b/maven.spec
index df0bf7b..5cad05f 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,6 +1,6 @@
 Name:           maven
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java project management and project comprehension tool
 License:        ASL 2.0
 URL:            http://maven.apache.org/
@@ -191,7 +191,7 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/%{name}
 install -d -m 755 %{buildroot}%{_datadir}/bash-completion/completions
 install -d -m 755 %{buildroot}%{_mandir}/man1
 
-install -p -m 755 %{SOURCE200} %{buildroot}%{_bindir}/mvn
+for cmd in mvn mvnDebug mvnyjp; do sed s/@@CMD@@/$cmd/ %{SOURCE200} >%{buildroot}%{_bindir}/$cmd; done
 install -p -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1
 install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/bash-completion/completions/mvn
 mv $M2_HOME/bin/m2.conf %{buildroot}%{_sysconfdir}
@@ -250,7 +250,7 @@ ln -sf $(build-classpath plexus/classworlds) \
 %files -f .mfiles
 %doc LICENSE NOTICE README.md
 %{_datadir}/%{name}
-%{_bindir}/mvn
+%attr(0755,root,root) %{_bindir}/mvn*
 %dir %{_javadir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/logging
@@ -265,6 +265,10 @@ ln -sf $(build-classpath plexus/classworlds) \
 
 
 %changelog
+* Wed Apr  1 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-2
+- Install mvnDebug and mvnyjp in bindir
+- Resolves: rhbz#1207850
+
 * Mon Mar 16 2015 Michal Srb <msrb@redhat.com> - 3.3.1-1
 - Add commons-io, commons-lang and jsoup to plexus.core (Resolves: rhbz#1202286)