diff --git a/src/Mod/PartDesign/App/DatumFeature.cpp b/src/Mod/PartDesign/App/DatumFeature.cpp
index ce951ffa2..e9268c050 100644
--- a/src/Mod/PartDesign/App/DatumFeature.cpp
+++ b/src/Mod/PartDesign/App/DatumFeature.cpp
@@ -74,7 +74,8 @@ PROPERTY_SOURCE_ABSTRACT(PartDesign::Datum, App::GeoFeature)
 Datum::Datum(void)
 {
     ADD_PROPERTY_TYPE(References,(0,0),"References",(App::PropertyType)(App::Prop_None),"References defining the datum feature");
-    ADD_PROPERTY(Values,(0.0));
+    ADD_PROPERTY(Offset,(0.0));
+    ADD_PROPERTY(Angle,(0.0));
     touch();
 }
 
@@ -89,6 +90,12 @@ App::DocumentObjectExecReturn *Datum::execute(void)
     return StdReturn;
 }
 
+// Note: We don't distinguish between e.g. datum lines and edges here
+#define PLANE QObject::tr("DPLANE")
+#define LINE  QObject::tr("DLINE")
+#define POINT QObject::tr("DPOINT")
+#define ANGLE QObject::tr("Angle")
+
 void Datum::onChanged(const App::Property* prop)
 {
 
@@ -99,6 +106,15 @@ void Datum::onChanged(const App::Property* prop)
 
         for (int r = 0; r < refs.size(); r++)
             refTypes.insert(getRefType(refs[r], refnames[r]));
+
+        if (fabs(Angle.getValue()) > Precision::Confusion())
+            refTypes.insert(ANGLE);
+    } else if (prop == &Angle) {
+        // Zero value counts as angle not defined
+        if (fabs(Angle.getValue()) > Precision::Confusion())
+            refTypes.insert(ANGLE);
+        else
+            refTypes.erase(ANGLE);
     }
 
     App::GeoFeature::onChanged(prop);
@@ -111,11 +127,6 @@ void Datum::onDocumentRestored()
     App::GeoFeature::onDocumentRestored();
 }
 
-// Note: We don't distinguish between e.g. datum lines and edges here
-#define PLANE QObject::tr("DPLANE")
-#define LINE  QObject::tr("DLINE")
-#define POINT QObject::tr("DPOINT")
-
 const QString Datum::getRefType(const App::DocumentObject* obj, const std::string& subname)
 {
     Base::Type type = obj->getTypeId();
@@ -146,7 +157,7 @@ std::map<std::multiset<QString>, std::set<QString> > Point::hints = std::map<std
 void Point::initHints()
 {
     std::set<QString> DONE;
-    DONE.insert(QObject::tr("Point"));
+    DONE.insert(QObject::tr("Done"));
 
     std::multiset<QString> key;
     std::set<QString> value;
@@ -190,7 +201,7 @@ std::map<std::multiset<QString>, std::set<QString> > Line::hints = std::map<std:
 void Line::initHints()
 {
     std::set<QString> DONE;
-    DONE.insert(QObject::tr("Line"));
+    DONE.insert(QObject::tr("Done"));
 
     std::multiset<QString> key;
     std::set<QString> value;
@@ -225,7 +236,7 @@ std::map<std::multiset<QString>, std::set<QString> > Plane::hints = std::map<std
 void Plane::initHints()
 {
     std::set<QString> DONE;
-    DONE.insert(QObject::tr("Plane"));
+    DONE.insert(QObject::tr("Done"));
 
     std::multiset<QString> key;
     std::set<QString> value;
@@ -252,11 +263,31 @@ void Plane::initHints()
 
     key.clear(); value.clear();
     key.insert(LINE);
-    value.insert(POINT);
-    hints[key] = value; // LINE -> POINT
+    value.insert(POINT); value.insert(PLANE); value.insert(ANGLE);
+    hints[key] = value; // LINE -> POINT or PLANE or ANGLE
 
     key.clear(); value.clear();
-    value.insert(POINT); value.insert(LINE); value.insert(PLANE);
+    key.insert(PLANE); key.insert(LINE);
+    value.insert(ANGLE);
+    hints[key] = value; // {PLANE, LINE} -> ANGLE
+
+    key.clear(); value.clear();
+    key.insert(PLANE); key.insert(ANGLE);
+    value.insert(LINE);
+    hints[key] = value; // {PLANE, ANGLE} -> LINE
+
+    key.clear(); value.clear();
+    key.insert(ANGLE); key.insert(LINE);
+    value.insert(PLANE);
+    hints[key] = value; // {ANGLE, LINE} -> PLANE
+
+    key.clear(); value.clear();
+    key.insert(LINE); key.insert(PLANE); key.insert(ANGLE);
+    hints[key] = DONE; // {LINE, PLANE, ANGLE} -> DONE. Plane through line with angle to other plane
+
+
+    key.clear(); value.clear();
+    value.insert(POINT); value.insert(LINE); value.insert(PLANE); value.insert(ANGLE);
     hints[key] = value;
 }
 
@@ -281,7 +312,7 @@ void Point::onChanged(const App::Property* prop)
 
     if (prop == &References) {
         std::set<QString> hint = getHint();
-        if (!((hint.size() == 1) && (hint.find(QObject::tr("Point")) != hint.end())))
+        if (!((hint.size() == 1) && (hint.find(QObject::tr("Done")) != hint.end())))
             return; // incomplete references
 
         // Extract the geometry of the references
@@ -450,7 +481,7 @@ void Line::onChanged(const App::Property *prop)
 
     if (prop == &References) {
         std::set<QString> hint = getHint();
-        if (!((hint.size() == 1) && (hint.find(QObject::tr("Line")) != hint.end())))
+        if (!((hint.size() == 1) && (hint.find(QObject::tr("Done")) != hint.end())))
             return; // incomplete references
 
         // Extract the geometry of the references
@@ -599,7 +630,7 @@ void Plane::onChanged(const App::Property *prop)
 
     if (prop == &References) {
         std::set<QString> hint = getHint();
-        if (!((hint.size() == 1) && (hint.find(QObject::tr("Plane")) != hint.end())))
+        if (!((hint.size() == 1) && (hint.find(QObject::tr("Done")) != hint.end())))
             return; // incomplete references
 
         // Extract the geometry of the references
@@ -680,7 +711,16 @@ void Plane::onChanged(const App::Property *prop)
             }
         }
 
-        if ((p1 != NULL) && (normal != NULL)) {
+        *normal = normal->Normalize();
+
+        if ((line != NULL) && (normal != NULL) && (p1 != NULL) && (fabs(Angle.getValue()) > Precision::Confusion())) {
+            // plane from line, plane, and angle to plane
+            gp_Pnt p = line->Location();
+            *p1 = Base::Vector3d(p.X(), p.Y(), p.Z());
+            gp_Dir dir = line->Direction();
+            Base::Rotation rot(Base::Vector3d(dir.X(), dir.Y(), dir.Z()), Angle.getValue() / 180.0 * M_PI);
+            rot.multVec(*normal, *normal);
+        } else if ((p1 != NULL) && (normal != NULL)) {
             // plane from other plane. Nothing to be done
         } else if ((p1 != NULL) && (p2 != NULL) && (p3 != NULL)) {
             // Plane from three points
@@ -699,6 +739,9 @@ void Plane::onChanged(const App::Property *prop)
             return;
         }
 
+        if (fabs(Offset.getValue()) > Precision::Confusion())
+            *p1 += Offset.getValue() * *normal;
+
         _Base.setValue(*p1);
         _Normal.setValue(*normal);
         _Base.touch(); // This triggers ViewProvider::updateData()
diff --git a/src/Mod/PartDesign/App/DatumFeature.h b/src/Mod/PartDesign/App/DatumFeature.h
index 768bdb204..ab4e357b9 100644
--- a/src/Mod/PartDesign/App/DatumFeature.h
+++ b/src/Mod/PartDesign/App/DatumFeature.h
@@ -41,8 +41,9 @@ public:
 
     /// The references defining the datum object, e.g. three planes for a point, two planes for a line
     App::PropertyLinkSubList References;
-    /// The values defining the datum object, e.g. the offset from a Reference plane
-    App::PropertyFloatList Values;
+    /// Offset and angle for defining planes
+    App::PropertyFloat Offset;
+    App::PropertyFloat Angle;
 
     /// recalculate the feature
     App::DocumentObjectExecReturn *execute(void);
diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp
index 7081d2f23..48178f0b4 100644
--- a/src/Mod/PartDesign/Gui/Command.cpp
+++ b/src/Mod/PartDesign/Gui/Command.cpp
@@ -372,7 +372,8 @@ void CmdPartDesignPlane::activated(int iMsg)
     doCommand(Doc,"App.activeDocument().addObject('PartDesign::Plane','%s')",FeatName.c_str());
     if (refStr.length() > 0)
         doCommand(Doc,"App.activeDocument().%s.References = %s",FeatName.c_str(),refStr.toStdString().c_str());
-    doCommand(Doc,"App.activeDocument().%s.Values = [10.0]",FeatName.c_str());
+    doCommand(Doc,"App.activeDocument().%s.Offset = 0.0",FeatName.c_str());
+    doCommand(Doc,"App.activeDocument().%s.Angle = 0.0",FeatName.c_str());
     doCommand(Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)",
                    pcActiveBody->getNameInDocument(), FeatName.c_str());
     doCommand(Gui,"App.activeDocument().recompute()");  // recompute the feature based on its references
@@ -413,7 +414,6 @@ void CmdPartDesignLine::activated(int iMsg)
     doCommand(Doc,"App.activeDocument().addObject('PartDesign::Line','%s')",FeatName.c_str());
     if (refStr.length() > 0)
         doCommand(Doc,"App.activeDocument().%s.References = %s",FeatName.c_str(),refStr.toStdString().c_str());
-    doCommand(Doc,"App.activeDocument().%s.Values = [10.0]",FeatName.c_str());
     doCommand(Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)",
                    pcActiveBody->getNameInDocument(), FeatName.c_str());
     doCommand(Gui,"App.activeDocument().recompute()");  // recompute the feature based on its references
@@ -454,7 +454,6 @@ void CmdPartDesignPoint::activated(int iMsg)
     doCommand(Doc,"App.activeDocument().addObject('PartDesign::Point','%s')",FeatName.c_str());
     if (refStr.length() > 0)
         doCommand(Doc,"App.activeDocument().%s.References = %s",FeatName.c_str(),refStr.toStdString().c_str());
-    doCommand(Doc,"App.activeDocument().%s.Values = [10.0]",FeatName.c_str());
     doCommand(Doc,"App.activeDocument().%s.addFeature(App.activeDocument().%s)",
                    pcActiveBody->getNameInDocument(), FeatName.c_str());
     doCommand(Gui,"App.activeDocument().recompute()");  // recompute the feature based on its references
diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
index 0adfb5f1a..d608c8544 100644
--- a/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.cpp
@@ -106,9 +106,11 @@ TaskDatumParameters::TaskDatumParameters(ViewProviderDatum *DatumView,QWidget *p
     ui->setupUi(proxy);
     QMetaObject::connectSlotsByName(this);
 
-    connect(ui->spinValue1, SIGNAL(valueChanged(double)),
-            this, SLOT(onValue1Changed(double)));
-    connect(ui->checkBox1, SIGNAL(toggled(bool)),
+    connect(ui->spinOffset, SIGNAL(valueChanged(double)),
+            this, SLOT(onOffsetChanged(double)));
+    connect(ui->spinAngle, SIGNAL(valueChanged(double)),
+            this, SLOT(onAngleChanged(double)));
+    connect(ui->checkBoxFlip, SIGNAL(toggled(bool)),
             this, SLOT(onCheckBox1(bool)));
     connect(ui->buttonRef1, SIGNAL(pressed()),
             this, SLOT(onButtonRef1()));
@@ -126,8 +128,9 @@ TaskDatumParameters::TaskDatumParameters(ViewProviderDatum *DatumView,QWidget *p
     this->groupLayout()->addWidget(proxy);
 
     // Temporarily prevent unnecessary feature recomputes
-    ui->spinValue1->blockSignals(true);
-    ui->checkBox1->blockSignals(true);
+    ui->spinOffset->blockSignals(true);
+    ui->spinAngle->blockSignals(true);
+    ui->checkBoxFlip->blockSignals(true);
     ui->buttonRef1->blockSignals(true);
     ui->lineRef1->blockSignals(true);
     ui->buttonRef2->blockSignals(true);
@@ -137,16 +140,17 @@ TaskDatumParameters::TaskDatumParameters(ViewProviderDatum *DatumView,QWidget *p
 
     // Get the feature data    
     PartDesign::Datum* pcDatum = static_cast<PartDesign::Datum*>(DatumView->getObject());
-    std::vector<App::DocumentObject*> refs = pcDatum->References.getValues();
+    //std::vector<App::DocumentObject*> refs = pcDatum->References.getValues();
     std::vector<std::string> refnames = pcDatum->References.getSubValues();
 
-
     //bool checked1 = pcDatum->Checked.getValue();
-    std::vector<double> vals = pcDatum->Values.getValues();
+    double offset = pcDatum->Offset.getValue();
+    double angle = pcDatum->Angle.getValue();
 
     // Fill data into dialog elements
-    ui->spinValue1->setValue(vals[0]);
-    //ui->checkBox1->setChecked(checked1);
+    ui->spinOffset->setValue(offset);
+    ui->spinAngle->setValue(angle);
+    //ui->checkBoxFlip->setChecked(checked1);
     std::vector<QString> refstrings;
     makeRefStrings(refstrings, refnames);
     ui->lineRef1->setText(refstrings[0]);
@@ -157,8 +161,9 @@ TaskDatumParameters::TaskDatumParameters(ViewProviderDatum *DatumView,QWidget *p
     ui->lineRef3->setProperty("RefName", QByteArray(refnames[2].c_str()));
 
     // activate and de-activate dialog elements as appropriate
-    ui->spinValue1->blockSignals(false);
-    ui->checkBox1->blockSignals(false);
+    ui->spinOffset->blockSignals(false);
+    ui->spinAngle->blockSignals(false);
+    ui->checkBoxFlip->blockSignals(false);
     ui->buttonRef1->blockSignals(false);
     ui->lineRef1->blockSignals(false);
     ui->buttonRef2->blockSignals(false);
@@ -179,7 +184,10 @@ const QString makeRefText(std::set<QString> hint)
             tText = QObject::tr("Line");
         else if (((*t) == QObject::tr("DPOINT")) || ((*t) == QObject::tr("Point")))
             tText = QObject::tr("Point");
+        else if ((*t) == QObject::tr("Done"))
+            tText = QObject::tr("Done");
         result += QString::fromAscii(result.size() == 0 ? "" : "/") + tText;
+        // Note: ANGLE is not passed back here but needs separate treatment
     }
 
     return result;
@@ -187,20 +195,21 @@ const QString makeRefText(std::set<QString> hint)
 
 void TaskDatumParameters::updateUI()
 {
-    ui->checkBox1->setEnabled(false);
+    ui->checkBoxFlip->setVisible(false);
+    if (DatumView->datumType != QObject::tr("Plane")) {
+        ui->labelAngle->setVisible(false);
+        ui->labelOffset->setVisible(false);
+        ui->spinAngle->setVisible(false);
+        ui->spinOffset->setVisible(false);
+    }
 
     PartDesign::Datum* pcDatum = static_cast<PartDesign::Datum*>(DatumView->getObject());
     std::vector<App::DocumentObject*> refs = pcDatum->References.getValues();
     completed = false;
 
-    if (refs.size() == 3) {
-        onButtonRef1(false); // No more references required
-        completed = true;
-        return;
-    }
-
     // Get hints for further required references
-    std::set<QString> hint = pcDatum->getHint();
+    std::set<QString> hint = pcDatum->getHint();    
+
     if (hint == std::set<QString>()) {
         QMessageBox::warning(this, tr("Illegal selection"), tr("This feature cannot be created with this combination of references"));
         if (refs.size() == 1) {
@@ -213,28 +222,42 @@ void TaskDatumParameters::updateUI()
         return;
     }
 
+    double angle = pcDatum->Angle.getValue();
+    bool needAngle = (hint.find(QObject::tr("Angle")) != hint.end());
+    hint.erase(QObject::tr("Angle"));
+
     // Enable the next reference button
-    if (refs.size() == 0) {
+    int numrefs = refs.size();
+    if (needAngle && hint.empty())
+        numrefs--;
+    if (numrefs == 0) {
         ui->buttonRef2->setEnabled(false);
         ui->lineRef2->setEnabled(false);
         ui->buttonRef3->setEnabled(false);
         ui->lineRef3->setEnabled(false);
-    } else if (refs.size() == 1) {
+    } else if (numrefs == 1) {
         ui->buttonRef2->setEnabled(true);
         ui->lineRef2->setEnabled(true);
         ui->buttonRef3->setEnabled(false);
         ui->lineRef3->setEnabled(false);
-    } else if (refs.size() == 2) {
+    } else if (numrefs == 2) {
         ui->buttonRef2->setEnabled(true);
         ui->lineRef2->setEnabled(true);
         ui->buttonRef3->setEnabled(true);
         ui->lineRef3->setEnabled(true);
     }
+    if (needAngle) {
+        ui->labelAngle->setEnabled(true);
+        ui->spinAngle->setEnabled(true);
+    } else if (fabs(angle) < Precision::Confusion()) {
+        ui->labelAngle->setEnabled(false);
+        ui->spinAngle->setEnabled(false);
+    }
 
-    QString refText = makeRefText(hint);
+    QString hintText = makeRefText(hint);
 
     // Check if we have all required references
-    if (refText == DatumView->datumType) {
+    if (hintText == QObject::tr("Done")) {
         if (refs.size() == 1) {
             ui->buttonRef2->setEnabled(false);
             ui->lineRef2->setEnabled(false);
@@ -244,19 +267,25 @@ void TaskDatumParameters::updateUI()
             ui->buttonRef3->setEnabled(false);
             ui->lineRef3->setEnabled(false);
         }
+        if (fabs(angle) < Precision::Confusion()) {
+            ui->labelAngle->setEnabled(false);
+            ui->spinAngle->setEnabled(false);
+        }
         onButtonRef1(false); // No more references required
         completed = true;
         return;
     }
 
-    if (refs.size() == 0) {
-        onButtonRef1(true);
-    } else if (refs.size() == 1) {
-        ui->buttonRef2->setText(refText);
-        onButtonRef2(true);
-    } else if (refs.size() == 2) {
-        ui->buttonRef3->setText(refText);
-        onButtonRef3(true);
+    if (hintText.size() != 0) {
+        if (numrefs == 0) {
+            onButtonRef1(true);
+        } else if (numrefs == 1) {
+            ui->buttonRef2->setText(hintText);
+            onButtonRef2(true);
+        } else if (numrefs == 2) {
+            ui->buttonRef3->setText(hintText);
+            onButtonRef3(true);
+        }
     }
 }
 
@@ -318,16 +347,23 @@ void TaskDatumParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
     }
 }
 
-void TaskDatumParameters::onValue1Changed(double val)
+void TaskDatumParameters::onOffsetChanged(double val)
 {
     PartDesign::Datum* pcDatum = static_cast<PartDesign::Datum*>(DatumView->getObject());
-    std::vector<double> vals = pcDatum->Values.getValues();
-    vals[0] = val;
-    pcDatum->Values.setValues(vals);
+    pcDatum->Offset.setValue(val);
     pcDatum->getDocument()->recomputeFeature(pcDatum);
+    updateUI();
 }
 
-void TaskDatumParameters::onCheckBox1(bool on)
+void TaskDatumParameters::onAngleChanged(double val)
+{
+    PartDesign::Datum* pcDatum = static_cast<PartDesign::Datum*>(DatumView->getObject());
+    pcDatum->Angle.setValue(val);
+    pcDatum->getDocument()->recomputeFeature(pcDatum);
+    updateUI();
+}
+
+void TaskDatumParameters::onCheckFlip(bool on)
 {
     PartDesign::Datum* pcDatum = static_cast<PartDesign::Datum*>(DatumView->getObject());
     //pcDatum->Reversed.setValue(on);
@@ -420,35 +456,30 @@ void TaskDatumParameters::onRefName(const QString& text, const int idx)
         // TODO: check validity of the text that was entered: Does subElement actually reference to an element on the obj?
 
         // We must expect that "text" is the translation of "Face", "Edge" or "Vertex" followed by an ID.
-        QString name;
-        QTextStream str(&name);
-        QRegExp rx(name);
+        QRegExp rx;
         std::stringstream ss;
 
-        str << "^" << tr("Face") << "(\\d+)$";
-        if (parts[1].indexOf(rx) < 0) {
-            line->setProperty("RefName", QByteArray());
-            return;
-        } else {
+        rx.setPattern(QString::fromAscii("^") + tr("Face") + QString::fromAscii("(\\d+)$"));
+        if (parts[1].indexOf(rx) >= 0) {
             int faceId = rx.cap(1).toInt();
             ss << "Face" << faceId;
-        }
-        str << "^" << tr("Edge") << "(\\d+)$";
-        if (parts[1].indexOf(rx) < 0) {
-            line->setProperty("RefName", QByteArray());
-            return;
         } else {
-            int lineId = rx.cap(1).toInt();
-            ss << "Edge" << lineId;
-        }
-        str << "^" << tr("Vertex") << "(\\d+)$";
-        if (parts[1].indexOf(rx) < 0) {
-            line->setProperty("RefName", QByteArray());
-            return;
-        } else {
-            int vertexId = rx.cap(1).toInt();
-            ss << "Vertex" << vertexId;
+            rx.setPattern(QString::fromAscii("^") + tr("Edge") + QString::fromAscii("(\\d+)$"));
+            if (parts[1].indexOf(rx) >= 0) {
+                int lineId = rx.cap(1).toInt();
+                ss << "Edge" << lineId;
+            } else {
+                rx.setPattern(QString::fromAscii("^") + tr("Vertex") + QString::fromAscii("(\\d+)$"));
+                if (parts[1].indexOf(rx) < 0) {
+                    line->setProperty("RefName", QByteArray());
+                    return;
+                } else {
+                    int vertexId = rx.cap(1).toInt();
+                    ss << "Vertex" << vertexId;
+                }
+            }
         }
+
         line->setProperty("RefName", QByteArray(ss.str().c_str()));
         subElement = ss.str();
     }
@@ -456,16 +487,15 @@ void TaskDatumParameters::onRefName(const QString& text, const int idx)
     PartDesign::Datum* pcDatum = static_cast<PartDesign::Datum*>(DatumView->getObject());
     std::vector<App::DocumentObject*> refs = pcDatum->References.getValues();
     std::vector<std::string> refnames = pcDatum->References.getSubValues();
-    if (refSelectionMode < refs.size()) {
-        refs[refSelectionMode] = obj;
-        refnames[refSelectionMode] = subElement.c_str();
+    if (idx < refs.size()) {
+        refs[idx] = obj;
+        refnames[idx] = subElement.c_str();
     } else {
         refs.push_back(obj);
         refnames.push_back(subElement.c_str());
     }
     pcDatum->References.setValues(refs, refnames);
     updateUI();
-    //pcDatum->getDocument()->recomputeFeature(pcDatum);
 }
 
 void TaskDatumParameters::onRefName1(const QString& text)
@@ -481,14 +511,19 @@ void TaskDatumParameters::onRefName3(const QString& text)
     onRefName(text, 2);
 }
 
-double TaskDatumParameters::getValue1() const
+double TaskDatumParameters::getOffset() const
 {
-    return ui->spinValue1->value();
+    return ui->spinOffset->value();
 }
 
-bool   TaskDatumParameters::getCheck1() const
+double TaskDatumParameters::getAngle() const
 {
-    return ui->checkBox1->isChecked();
+    return ui->spinAngle->value();
+}
+
+bool   TaskDatumParameters::getFlip() const
+{
+    return ui->checkBoxFlip->isChecked();
 }
 
 QString TaskDatumParameters::getReference(const int idx) const
@@ -523,8 +558,9 @@ void TaskDatumParameters::changeEvent(QEvent *e)
 {
     TaskBox::changeEvent(e);
     if (e->type() == QEvent::LanguageChange) {
-        ui->spinValue1->blockSignals(true);
-        ui->checkBox1->blockSignals(true);
+        ui->spinOffset->blockSignals(true);
+        ui->spinAngle->blockSignals(true);
+        ui->checkBoxFlip->blockSignals(true);
         ui->buttonRef1->blockSignals(true);
         ui->lineRef1->blockSignals(true);
         ui->buttonRef2->blockSignals(true);
@@ -541,8 +577,9 @@ void TaskDatumParameters::changeEvent(QEvent *e)
         ui->lineRef3->setText(refstrings[2]);
         // TODO: Translate DatumView->datumType ?
 
-        ui->spinValue1->blockSignals(false);
-        ui->checkBox1->blockSignals(false);
+        ui->spinOffset->blockSignals(false);
+        ui->spinAngle->blockSignals(false);
+        ui->checkBoxFlip->blockSignals(false);
         ui->buttonRef1->blockSignals(false);
         ui->lineRef1->blockSignals(false);
         ui->buttonRef2->blockSignals(false);
@@ -594,7 +631,8 @@ bool TaskDlgDatumParameters::accept()
     std::string name = DatumView->getObject()->getNameInDocument();
 
     try {
-        Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Values = [%f]",name.c_str(),parameter->getValue1());
+        Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Offset = %f",name.c_str(),parameter->getOffset());
+        Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Angle = %f",name.c_str(),parameter->getAngle());
         //Gui::Command::doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Checked = %i",name.c_str(),parameter->getCheckBox1()?1:0);
 
         App::DocumentObject* solid = PartDesignGui::ActivePartObject->getPrevSolidFeature();
diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.h b/src/Mod/PartDesign/Gui/TaskDatumParameters.h
index c2ea01ba5..dc9a4fea4 100644
--- a/src/Mod/PartDesign/Gui/TaskDatumParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.h
@@ -54,13 +54,15 @@ public:
     ~TaskDatumParameters();
 
     QString getReference(const int idx) const;
-    double getValue1(void) const;
-    bool   getCheck1(void) const;
+    double getOffset(void) const;
+    double getAngle(void) const;
+    bool   getFlip(void) const;
     const bool isCompleted() const { return completed; }
 
 private Q_SLOTS:
-    void onValue1Changed(double);
-    void onCheckBox1(bool);
+    void onOffsetChanged(double);
+    void onAngleChanged(double);
+    void onCheckFlip(bool);
     void onRefName1(const QString& text);
     void onRefName2(const QString& text);
     void onRefName3(const QString& text);
diff --git a/src/Mod/PartDesign/Gui/TaskDatumParameters.ui b/src/Mod/PartDesign/Gui/TaskDatumParameters.ui
index b8987e098..b780526d1 100644
--- a/src/Mod/PartDesign/Gui/TaskDatumParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskDatumParameters.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>272</width>
-    <height>192</height>
+    <height>215</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -57,18 +57,18 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="labelOffset">
        <property name="text">
         <string>Offset</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QDoubleSpinBox" name="spinValue1">
+      <widget class="QDoubleSpinBox" name="spinOffset">
        <property name="minimum">
-        <double>0.000000000000000</double>
+        <double>-999999999.000000000000000</double>
        </property>
        <property name="maximum">
         <double>999999999.000000000000000</double>
@@ -77,14 +77,41 @@
         <double>5.000000000000000</double>
        </property>
        <property name="value">
-        <double>10.000000000000000</double>
+        <double>0.000000000000000</double>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QCheckBox" name="checkBox1">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="labelAngle">
+       <property name="text">
+        <string>Angle</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDoubleSpinBox" name="spinAngle">
+       <property name="minimum">
+        <double>-360.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>360.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="value">
+        <double>0.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="checkBoxFlip">
      <property name="text">
       <string>Flip sides</string>
      </property>