diff --git a/lib/src/slovenian/CatSlv.gf b/lib/src/slovenian/CatSlv.gf
index 7e3f43007..8912107aa 100644
--- a/lib/src/slovenian/CatSlv.gf
+++ b/lib/src/slovenian/CatSlv.gf
@@ -5,6 +5,9 @@ lincat
   Cl = {s : P.Tense => P.Anteriority => P.Polarity => Str} ;
   Imp = {s : P.Polarity => Gender => Number => Str} ;
 
+  -- Question
+  QCl = {s : P.Tense => P.Anteriority => P.Polarity => Str} ;
+
   -- Verb
   VP = ResSlv.VP ;
   VPSlash = ResSlv.VP ** {c2 : Prep} ;
diff --git a/lib/src/slovenian/GrammarSlv.gf b/lib/src/slovenian/GrammarSlv.gf
index 0e1c382eb..398d77250 100644
--- a/lib/src/slovenian/GrammarSlv.gf
+++ b/lib/src/slovenian/GrammarSlv.gf
@@ -7,8 +7,8 @@ concrete GrammarSlv of Grammar =
   AdverbSlv,
   NumeralSlv,
   SentenceSlv,
-{-  QuestionSlv,
-  RelativeSlv,
+  QuestionSlv,
+{-  RelativeSlv,
   ConjunctionSlv,-}
   PhraseSlv,
   TextX - [Pol,PPos,PNeg],
diff --git a/lib/src/slovenian/PhraseSlv.gf b/lib/src/slovenian/PhraseSlv.gf
index 83ed0729d..783d7ad26 100644
--- a/lib/src/slovenian/PhraseSlv.gf
+++ b/lib/src/slovenian/PhraseSlv.gf
@@ -4,6 +4,7 @@ concrete PhraseSlv of Phrase = CatSlv ** open Prelude, ResSlv in {
     PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
 
     UttS s = s ;
+    UttQS qs = qs ;
     UttImpSg pol imp = {s = pol.s ++ imp.s ! pol.p ! Masc ! Sg} ;
     UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! Masc ! Sg} ;
     UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! Masc ! Sg} ;
diff --git a/lib/src/slovenian/QuestionSlv.gf b/lib/src/slovenian/QuestionSlv.gf
new file mode 100644
index 000000000..b0fdf0f85
--- /dev/null
+++ b/lib/src/slovenian/QuestionSlv.gf
@@ -0,0 +1,2 @@
+concrete QuestionSlv of Question = CatSlv ** open ResSlv in {
+}
diff --git a/lib/src/slovenian/SentenceSlv.gf b/lib/src/slovenian/SentenceSlv.gf
index c73f25538..fd5fefdbe 100644
--- a/lib/src/slovenian/SentenceSlv.gf
+++ b/lib/src/slovenian/SentenceSlv.gf
@@ -10,6 +10,9 @@ lin
     UseCl  t p cl = {
       s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p
     } ;
+    UseQCl t p cl = {
+      s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p
+    } ;
 
 }