diff --git a/tasks/install.yaml b/tasks/install.yaml
index 3b7d162..1ca451a 100644
--- a/tasks/install.yaml
+++ b/tasks/install.yaml
@@ -49,10 +49,4 @@
   with_items: diskimage_builder_depends
   when: diskimage_builder_install_method == 'git' or diskimage_builder_install_method == 'pip'
 
-- name: Install diskimage-builder from OS package.
-  package:
-    pkg: "{{ diskimage_builder_pkg_name }}"
-    state: installed
-  when: diskimage_builder_install_method == 'pkg'
-
 - include: "install/{{ diskimage_builder_install_method }}.yaml"
diff --git a/tasks/install/package.yaml b/tasks/install/package.yaml
new file mode 100644
index 0000000..e446248
--- /dev/null
+++ b/tasks/install/package.yaml
@@ -0,0 +1,18 @@
+# Copyright 2015 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+---
+- name: Install diskimage-builder from package.
+  package:
+    pkg: "{{ diskimage_builder_pkg_name }}"
+    state: installed