diff --git a/openpkg-tool/openpkg-index.pl b/openpkg-tool/openpkg-index.pl
index 63c571b347..61eb1e2b1f 100644
--- a/openpkg-tool/openpkg-index.pl
+++ b/openpkg-tool/openpkg-index.pl
@@ -271,7 +271,7 @@ sub package2data ($$) {
                 } elsif (exists $evar{$3}) {
                     $term .= ($4 eq 'no' ? '! ' : '').vsub(\%evar,'%{'.$3.'}');
                 } else {
-                    warn "WARNING: unknown conditional '$2':\n< $l\n> $v\n";
+                    warn "WARNING: unknown conditional '$3':\n< $l\n> $v\n";
                 }
             }
 
@@ -312,9 +312,17 @@ sub package2data ($$) {
             #
             if (exists $evar{$1}) {
                 if ($2 eq 'yes') {
-                    $evar{$1} = "( \%\{$1\} || ( $cond ) )";
+                    if ($cond eq '') {
+                        $evar{$1} = "( \%\{$1\} )";
+                    } else {
+                        $evar{$1} = "( \%\{$1\} || ( $cond ) )";
+                    }
                 } elsif ($2 eq 'no') {
-                    $evar{$1} = "( %\{$1\} && ! ( $cond ) )";
+                    if ($cond eq '') {
+                        $evar{$1} = "( \%\{$1\} )";
+                    } else {
+                        $evar{$1} = "( %\{$1\} && ! ( $cond ) )";
+                    }
                 } else {
                     warn "WARNING: logic too complex for '$1':\n< $l\n> $v\n";
                 }
diff --git a/openpkg-tool/openpkg-tool.spec b/openpkg-tool/openpkg-tool.spec
index 6f1e073f3b..9a4a2a7fc1 100644
--- a/openpkg-tool/openpkg-tool.spec
+++ b/openpkg-tool/openpkg-tool.spec
@@ -32,8 +32,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [PLUS]
 Group:        Bootstrapping
 License:      GPL
-Version:      20030207
-Release:      20030207
+Version:      20030212
+Release:      20030212
 
 #   list of sources
 Source0:      openpkg.sh