diff --git a/src/operations/package-manager/build.vala b/src/operations/package-manager/build.vala
index 1c7edf2..f0f3d47 100755
--- a/src/operations/package-manager/build.vala
+++ b/src/operations/package-manager/build.vala
@@ -13,7 +13,7 @@ private static int build_operation (string[] args) {
             error_add("Build path: %s (%s)".printf(bd.ymp_build.ympbuild_buildpath, arg));
             return r;
         }
-        if(get_bool("install")) {
+        if(get_bool("install") && !get_bool("no-binary")) {
             quarantine_import_from_path(bd.ymp_build.ympbuild_buildpath);
             quarantine_install ();
             quarantine_reset ();
diff --git a/src/util/build.vala b/src/util/build.vala
index 05f3956..38d62c5 100755
--- a/src/util/build.vala
+++ b/src/util/build.vala
@@ -124,12 +124,7 @@ public class builder {
             restore_env();
             return 1;
         }
-        if (!build_target.create_metadata_info()) {
-            error_add(_("Failed to create metadata: %s").printf(srcpath));
-            set_bool("unsafe", unsafe);
-            restore_env();
-            return 1;
-        }
+
         // Set build target again (emerge change build target)
         ymp_build.set_ympbuild_srcpath(srcpath);
         string build_path = srealpath(get_build_dir() + "/" + calculate_md5sum(srcpath + "/ympbuild"));
@@ -162,6 +157,12 @@ public class builder {
             }
         }
         if (!get_bool("no-binary")) {
+            if (!build_target.create_metadata_info()) {
+                error_add(_("Failed to create metadata: %s").printf(srcpath));
+                set_bool("unsafe", unsafe);
+                restore_env();
+                return 1;
+            }
             info("Create binary package");
             if (!extract_package_sources()) {
                 set_bool("unsafe", unsafe);
diff --git a/src/util/builder_target/ymp.vala b/src/util/builder_target/ymp.vala
index 784372c..646adf0 100755
--- a/src/util/builder_target/ymp.vala
+++ b/src/util/builder_target/ymp.vala
@@ -214,6 +214,7 @@ private static void build_target_ymp_init() {
         ymp_target.builder.output_package_name = name + "_" + version + "_" + release;
         create_dir(buildpath);
         writefile(buildpath + "/metadata.yaml", trim(new_data));
+        print(buildpath + "/metadata.yaml");
         return true;
     });