diff --git a/downloads/discovery/oxygen/images/BMM_logo_32x32.png b/downloads/discovery/oxygen/images/BMM_logo_32x32.png
new file mode 100755
index 0000000..1c4a390
--- /dev/null
+++ b/downloads/discovery/oxygen/images/BMM_logo_32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/DiagramTemplate.gif b/downloads/discovery/oxygen/images/DiagramTemplate.gif
new file mode 100755
index 0000000..90ab9f3
--- /dev/null
+++ b/downloads/discovery/oxygen/images/DiagramTemplate.gif
Binary files differ
diff --git a/downloads/discovery/oxygen/images/EASTADL_32x32.gif b/downloads/discovery/oxygen/images/EASTADL_32x32.gif
new file mode 100755
index 0000000..0475012
--- /dev/null
+++ b/downloads/discovery/oxygen/images/EASTADL_32x32.gif
Binary files differ
diff --git a/downloads/discovery/oxygen/images/Layout_32x32.png b/downloads/discovery/oxygen/images/Layout_32x32.png
new file mode 100755
index 0000000..0ca89ee
--- /dev/null
+++ b/downloads/discovery/oxygen/images/Layout_32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/Papyrus_4_Metrics_logo_32x32.png b/downloads/discovery/oxygen/images/Papyrus_4_Metrics_logo_32x32.png
new file mode 100755
index 0000000..0305826
--- /dev/null
+++ b/downloads/discovery/oxygen/images/Papyrus_4_Metrics_logo_32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/Papyrus_4_Requirements_logo_32x32.png b/downloads/discovery/oxygen/images/Papyrus_4_Requirements_logo_32x32.png
new file mode 100755
index 0000000..cce9ac9
--- /dev/null
+++ b/downloads/discovery/oxygen/images/Papyrus_4_Requirements_logo_32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/Papyrus_CDO.png b/downloads/discovery/oxygen/images/Papyrus_CDO.png
new file mode 100755
index 0000000..e625d47
--- /dev/null
+++ b/downloads/discovery/oxygen/images/Papyrus_CDO.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/alf-icon-32x32.png b/downloads/discovery/oxygen/images/alf-icon-32x32.png
new file mode 100755
index 0000000..52aa7a5
--- /dev/null
+++ b/downloads/discovery/oxygen/images/alf-icon-32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/codegen-32x32.gif b/downloads/discovery/oxygen/images/codegen-32x32.gif
new file mode 100755
index 0000000..1afc71d
--- /dev/null
+++ b/downloads/discovery/oxygen/images/codegen-32x32.gif
Binary files differ
diff --git a/downloads/discovery/oxygen/images/codegen-32x32.png b/downloads/discovery/oxygen/images/codegen-32x32.png
new file mode 100755
index 0000000..fae153a
--- /dev/null
+++ b/downloads/discovery/oxygen/images/codegen-32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/designer_32_32.png b/downloads/discovery/oxygen/images/designer_32_32.png
new file mode 100755
index 0000000..c67299d
--- /dev/null
+++ b/downloads/discovery/oxygen/images/designer_32_32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/layout.gif b/downloads/discovery/oxygen/images/layout.gif
new file mode 100755
index 0000000..f363799
--- /dev/null
+++ b/downloads/discovery/oxygen/images/layout.gif
Binary files differ
diff --git a/downloads/discovery/oxygen/images/marte-32x32.png b/downloads/discovery/oxygen/images/marte-32x32.png
new file mode 100755
index 0000000..05d37f0
--- /dev/null
+++ b/downloads/discovery/oxygen/images/marte-32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/marte.png b/downloads/discovery/oxygen/images/marte.png
new file mode 100755
index 0000000..51319eb
--- /dev/null
+++ b/downloads/discovery/oxygen/images/marte.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/moka.png b/downloads/discovery/oxygen/images/moka.png
new file mode 100755
index 0000000..a23db78
--- /dev/null
+++ b/downloads/discovery/oxygen/images/moka.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/papyrus_compare_32x32.png b/downloads/discovery/oxygen/images/papyrus_compare_32x32.png
new file mode 100755
index 0000000..af0c3a8
--- /dev/null
+++ b/downloads/discovery/oxygen/images/papyrus_compare_32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/robotml_32_32.png b/downloads/discovery/oxygen/images/robotml_32_32.png
new file mode 100755
index 0000000..d2410b7
--- /dev/null
+++ b/downloads/discovery/oxygen/images/robotml_32_32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/images/sysml_32_32.gif b/downloads/discovery/oxygen/images/sysml_32_32.gif
new file mode 100755
index 0000000..ecc0b71
--- /dev/null
+++ b/downloads/discovery/oxygen/images/sysml_32_32.gif
Binary files differ
diff --git a/downloads/discovery/oxygen/images/table_32x32.png b/downloads/discovery/oxygen/images/table_32x32.png
new file mode 100755
index 0000000..c9075e9
--- /dev/null
+++ b/downloads/discovery/oxygen/images/table_32x32.png
Binary files differ
diff --git a/downloads/discovery/oxygen/papyrus-extra.xmi b/downloads/discovery/oxygen/papyrus-extra.xmi
new file mode 100755
index 0000000..6b97583
--- /dev/null
+++ b/downloads/discovery/oxygen/papyrus-extra.xmi
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="ASCII"?>
+<discovery:DiscoveryDefinition
+    xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:discovery="http://www.eclipse.org/papyrus/discovery/1.0">
+  <categories
+      name="Languages"
+      description="UML language extensions"
+      relevance="6">
+  </categories>
+  <categories
+      name="Modeler extensions"
+      description="Extension of the tool">
+    <components
+        name="Papyrus Layers"
+        provider="Eclipse Modeling Project"
+        description="Layers are used to control accurately what is shown by a diagram. A layer is used to associate some properties (graphical or domain) to some views (class, packages ...). This allows for example to set the same color to a set of views."
+        license="EPL"
+        groups="//@filters.1"
+        incubation="true">
+      <sitesURLS>http://download.eclipse.org/nightly/oxygen</sitesURLS>
+      <sitesURLS>https://hudson.eclipse.org/papyrus/job/papyrus-incubation-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.incubation.p2/target/repository/</sitesURLS>
+      <overview
+          summary="Layers are used to control accurately what is shown by a diagram. A layer is used to associate some properties (graphical or domain) to some views (class, packages ...). This allows for example to set the same color to a set of views."/>
+      <id>org.eclipse.papyrus.layers.feature</id>
+    </components>
+
+    <components
+        name="Papyrus DSML Validation"
+        provider="Eclipse Modeling Project"
+        description="Component to generate a validation plug-in from a UML Profile"
+        license="EPL"
+        groups="//@filters.1"
+        incubation="true">
+      <sitesURLS>http://download.eclipse.org/nightly/oxygen</sitesURLS>
+      <sitesURLS>https://hudson.eclipse.org/papyrus/job/papyrus-incubation-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.incubation.p2/target/repository/</sitesURLS>
+      <overview
+          summary="Component to generate a validation plug-in from a UML Profile"/>
+      <id>org.eclipse.papyrus.extra.dsml.validation.feature</id>
+    </components>
+    <components
+        name="Integrated ALF Editor"
+        provider="Eclipse Modeling Project"
+        description="Edit your packages, classes, signals, datatypes, enumerations, associations and activities with ALF"
+        license="EPL"
+        groups="//@filters.1"
+        image32="images/alf-icon-32x32.png"
+        incubation="true">
+      <sitesURLS>http://download.eclipse.org/nightly/oxygen</sitesURLS>
+      <sitesURLS>https://hudson.eclipse.org/papyrus/job/papyrus-incubation-oxygen/lastSuccessfulBuild/artifact/org.eclipse.papyrus.incubation.p2/target/repository/</sitesURLS>
+      <overview
+          summary="ALF is a standard language enabling the specification of fUML (subet of UML - scope limited to Classes an Activities) models using text. The advantage of ALF is that it is fully aligned on the subset of UML  covered by fUML. This means any ALF specification can be compiled as a fUML model. Conversely a fUML model can be translated as an ALF model whose representation is given textually. ALF provides a way to make easier the specification of fUML models. This is especially true in the case of activities which become hard to understand as soon as you have more than a dozen of action nodes. In the context of Papyrus an ALF editor is integrated within the property and become available according to the selection you have in your current model. For the moment edition is limited to Class, Signal, DataType, Enumeration, Package, Association and Activity. The user has the opportunity to modify, validate and compile (i.e. propagate the modifications) ALF specifications corresponding to these elements. "/>
+      <id>org.eclipse.papyrus.uml.alf.extra.feature</id>
+    </components>
+  </categories>
+  <filters name="Stable"/>
+  <filters name="Experimental"/>
+</discovery:DiscoveryDefinition>