diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes
index 352865c4..cf1190e6 100644
--- a/qemu-testsuite.changes
+++ b/qemu-testsuite.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 26 15:25:01 UTC 2017 - lyan@suse.com
+
+- Wrap analyze-migration and vmstate-static-checker into tools from
+  qemu scripts folder, also changed introduction of qemu-tools in 
+  spec file
+- Move supportplugin position in spec file 
+
 -------------------------------------------------------------------
 Thu Oct 19 21:57:57 UTC 2017 - brogers@suse.com
 
diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index 3f65acbd..ed79c21b 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -754,7 +754,8 @@ binaries for different architectures under your native operating
 system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
 as PC and PowerMac systems.
 
-This sub-package contains various tools, including a bridge helper.
+This sub-package contains various tools, including a bridge helper,
+ivshmem, qemu disk tools and some scripts for different purposes.
 
 %package guest-agent
 Summary:        Universal CPU emulator -- Guest agent
@@ -1248,15 +1249,16 @@ done
 install -D -m 644 %{SOURCE302} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
 install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
+install -D -m 755 scripts/analyze-migration.py  %{buildroot}%{_bindir}/analyze-migration.py
+install -D -m 755 scripts/vmstate-static-checker.py  %{buildroot}%{_bindir}/vmstate-static-checker.py
+mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
+install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if 0%{?is_opensuse} == 0
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_docdir}/qemu-x86/supported.txt
 install -D -m 0644 %{SOURCE13} %{buildroot}%{_docdir}/qemu-s390/supported.txt
 install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt
 install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 %endif
-# install supportconfig plugin
-mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
-install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if %{legacy_qemu_kvm}
 cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
 #!/bin/sh
@@ -1630,6 +1632,8 @@ fi
 %verify(not mode) %attr(4750,root,kvm) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf
+%_bindir/analyze-migration.py
+%_bindir/vmstate-static-checker.py
 
 %files guest-agent
 %defattr(-, root, root)
diff --git a/qemu.changes b/qemu.changes
index 352865c4..cf1190e6 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 26 15:25:01 UTC 2017 - lyan@suse.com
+
+- Wrap analyze-migration and vmstate-static-checker into tools from
+  qemu scripts folder, also changed introduction of qemu-tools in 
+  spec file
+- Move supportplugin position in spec file 
+
 -------------------------------------------------------------------
 Thu Oct 19 21:57:57 UTC 2017 - brogers@suse.com
 
diff --git a/qemu.spec b/qemu.spec
index f4e64b0e..4ae4815f 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -754,7 +754,8 @@ binaries for different architectures under your native operating
 system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
 as PC and PowerMac systems.
 
-This sub-package contains various tools, including a bridge helper.
+This sub-package contains various tools, including a bridge helper,
+ivshmem, qemu disk tools and some scripts for different purposes.
 
 %package guest-agent
 Summary:        Universal CPU emulator -- Guest agent
@@ -1248,15 +1249,16 @@ done
 install -D -m 644 %{SOURCE302} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
 install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
+install -D -m 755 scripts/analyze-migration.py  %{buildroot}%{_bindir}/analyze-migration.py
+install -D -m 755 scripts/vmstate-static-checker.py  %{buildroot}%{_bindir}/vmstate-static-checker.py
+mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
+install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if 0%{?is_opensuse} == 0
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_docdir}/qemu-x86/supported.txt
 install -D -m 0644 %{SOURCE13} %{buildroot}%{_docdir}/qemu-s390/supported.txt
 install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt
 install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 %endif
-# install supportconfig plugin
-mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
-install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if %{legacy_qemu_kvm}
 cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
 #!/bin/sh
@@ -1630,6 +1632,8 @@ fi
 %verify(not mode) %attr(4750,root,kvm) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf
+%_bindir/analyze-migration.py
+%_bindir/vmstate-static-checker.py
 
 %files guest-agent
 %defattr(-, root, root)
diff --git a/qemu.spec.in b/qemu.spec.in
index 3ab2eab4..8f30838d 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -713,7 +713,8 @@ binaries for different architectures under your native operating
 system. It currently emulates x86, ARM, PowerPC and SPARC CPUs as well
 as PC and PowerMac systems.
 
-This sub-package contains various tools, including a bridge helper.
+This sub-package contains various tools, including a bridge helper,
+ivshmem, qemu disk tools and some scripts for different purposes.
 
 %package guest-agent
 Summary:        Universal CPU emulator -- Guest agent
@@ -1166,15 +1167,16 @@ done
 install -D -m 644 %{SOURCE302} %{buildroot}%{_sysconfdir}/qemu/bridge.conf
 install -D -m 755 %{SOURCE2} %{buildroot}/usr/share/qemu/qemu-ifup
 install -D -p -m 0644 %{SOURCE8} %{buildroot}%{_udevrulesdir}/80-qemu-ga.rules
+install -D -m 755 scripts/analyze-migration.py  %{buildroot}%{_bindir}/analyze-migration.py
+install -D -m 755 scripts/vmstate-static-checker.py  %{buildroot}%{_bindir}/vmstate-static-checker.py
+mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
+install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if 0%{?is_opensuse} == 0
 install -D -m 0644 %{SOURCE12} %{buildroot}%{_docdir}/qemu-x86/supported.txt
 install -D -m 0644 %{SOURCE13} %{buildroot}%{_docdir}/qemu-s390/supported.txt
 install -D -m 0644 %{SOURCE14} %{buildroot}%{_docdir}/qemu-arm/supported.txt
 install -D -m 0644 %{SOURCE15} %{buildroot}%{_docdir}/qemu-ppc/supported.txt
 %endif
-# install supportconfig plugin
-mkdir -p %{buildroot}%{_libexecdir}/supportconfig/plugins
-install -D -m 0755 %{SOURCE16} %{buildroot}%{_libexecdir}/supportconfig/plugins/qemu
 %if %{legacy_qemu_kvm}
 cat > %{buildroot}%{_bindir}/qemu-kvm << 'EOF'
 #!/bin/sh
@@ -1548,6 +1550,8 @@ fi
 %verify(not mode) %attr(4750,root,kvm) %_libexecdir/qemu-bridge-helper
 %dir %_sysconfdir/%name
 %config %_sysconfdir/%name/bridge.conf
+%_bindir/analyze-migration.py
+%_bindir/vmstate-static-checker.py
 
 %files guest-agent
 %defattr(-, root, root)