diff --git a/admin/controller/extension/payment/mollie_eps.php b/admin/controller/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..88c3ab96
--- /dev/null
+++ b/admin/controller/extension/payment/mollie_eps.php
@@ -0,0 +1,6 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+class ControllerExtensionPaymentMollieEPS extends ControllerExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_EPS;
+}
diff --git a/admin/controller/extension/payment/mollie_giropay.php b/admin/controller/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..228c7044
--- /dev/null
+++ b/admin/controller/extension/payment/mollie_giropay.php
@@ -0,0 +1,6 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+class ControllerExtensionPaymentMollieGIROPAY extends ControllerExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_GIROPAY;
+}
diff --git a/admin/language/dutch/extension/payment/mollie.php b/admin/language/dutch/extension/payment/mollie.php
index 5413067d..cee48b6d 100644
--- a/admin/language/dutch/extension/payment/mollie.php
+++ b/admin/language/dutch/extension/payment/mollie.php
@@ -46,6 +46,8 @@
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
 $_['text_mollie_inghomepay']    = $method_list_logo;
+$_['text_mollie_eps']           = $method_list_logo;
+$_['text_mollie_giropay']       = $method_list_logo;
 
 // Heading
 $_['heading_title']         = "Mollie";
@@ -68,6 +70,8 @@
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
 $_['name_mollie_inghomepay']    = 'ING Home\'Pay';
+$_['name_mollie_eps']           = 'EPS';
+$_['name_mollie_giropay']       = 'Giropay';
 
 // Text
 $_['text_edit']                    = "Bewerk Mollie";
diff --git a/admin/language/dutch/extension/payment/mollie_eps.php b/admin/language/dutch/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..74c69006
--- /dev/null
+++ b/admin/language/dutch/extension/payment/mollie_eps.php
@@ -0,0 +1,3 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_eps'];
diff --git a/admin/language/dutch/extension/payment/mollie_giropay.php b/admin/language/dutch/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..8e1a5855
--- /dev/null
+++ b/admin/language/dutch/extension/payment/mollie_giropay.php
@@ -0,0 +1,3 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_giropay'];
diff --git a/admin/language/en-gb/extension/payment/mollie.php b/admin/language/en-gb/extension/payment/mollie.php
index 23f08925..5049704a 100644
--- a/admin/language/en-gb/extension/payment/mollie.php
+++ b/admin/language/en-gb/extension/payment/mollie.php
@@ -46,6 +46,8 @@
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
 $_['text_mollie_inghomepay']    = $method_list_logo;
+$_['text_mollie_eps']           = $method_list_logo;
+$_['text_mollie_giropay']       = $method_list_logo;
 
 // Heading
 $_['heading_title']           = "Mollie";
@@ -68,6 +70,8 @@
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
 $_['name_mollie_inghomepay']    = 'ING Home\'pay';
+$_['name_mollie_eps']           = 'EPS';
+$_['name_mollie_giropay']       = 'Giropay';
 
 // Text
 $_['text_edit']                    = "Edit";
diff --git a/admin/language/en-gb/extension/payment/mollie_eps.php b/admin/language/en-gb/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..5cff1aab
--- /dev/null
+++ b/admin/language/en-gb/extension/payment/mollie_eps.php
@@ -0,0 +1,4 @@
+
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_eps'];
diff --git a/admin/language/en-gb/extension/payment/mollie_giropay.php b/admin/language/en-gb/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..7f6b6f4b
--- /dev/null
+++ b/admin/language/en-gb/extension/payment/mollie_giropay.php
@@ -0,0 +1,4 @@
+
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_giropay'];
diff --git a/admin/language/english/extension/payment/mollie.php b/admin/language/english/extension/payment/mollie.php
index 9bc94042..ff04827b 100644
--- a/admin/language/english/extension/payment/mollie.php
+++ b/admin/language/english/extension/payment/mollie.php
@@ -68,6 +68,8 @@
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
 $_['name_mollie_inghomepay']    = 'ING Home\'pay';
+$_['name_mollie_eps']           = 'EPS';
+$_['name_mollie_giropay']       = 'Giropay';
 
 // Text
 $_['text_edit']                    = "Edit";
diff --git a/admin/language/english/extension/payment/mollie_eps.php b/admin/language/english/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..74c69006
--- /dev/null
+++ b/admin/language/english/extension/payment/mollie_eps.php
@@ -0,0 +1,3 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_eps'];
diff --git a/admin/language/english/extension/payment/mollie_giropay.php b/admin/language/english/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..8e1a5855
--- /dev/null
+++ b/admin/language/english/extension/payment/mollie_giropay.php
@@ -0,0 +1,3 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_giropay'];
diff --git a/admin/language/fr-fr/extension/payment/mollie.php b/admin/language/fr-fr/extension/payment/mollie.php
index 60565ae2..e187268a 100644
--- a/admin/language/fr-fr/extension/payment/mollie.php
+++ b/admin/language/fr-fr/extension/payment/mollie.php
@@ -46,6 +46,8 @@
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
 $_['text_mollie_inghomepay']    = $method_list_logo;
+$_['text_mollie_eps']           = $method_list_logo;
+$_['text_mollie_giropay']       = $method_list_logo;
 
 // Heading
 $_['heading_title']           = "Mollie";
@@ -68,6 +70,8 @@
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
 $_['name_mollie_inghomepay']    = 'ING Home\'pay';
+$_['name_mollie_eps']           = 'EPS';
+$_['name_mollie_giropay']       = 'Giropay';
 
 // Text
 $_['text_edit']                    = "Éditer Mollie";
diff --git a/admin/language/fr-fr/extension/payment/mollie_eps.php b/admin/language/fr-fr/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..74c69006
--- /dev/null
+++ b/admin/language/fr-fr/extension/payment/mollie_eps.php
@@ -0,0 +1,3 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_eps'];
diff --git a/admin/language/fr-fr/extension/payment/mollie_giropay.php b/admin/language/fr-fr/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..8e1a5855
--- /dev/null
+++ b/admin/language/fr-fr/extension/payment/mollie_giropay.php
@@ -0,0 +1,3 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_giropay'];
diff --git a/admin/language/french/extension/payment/mollie.php b/admin/language/french/extension/payment/mollie.php
index 60565ae2..e187268a 100644
--- a/admin/language/french/extension/payment/mollie.php
+++ b/admin/language/french/extension/payment/mollie.php
@@ -46,6 +46,8 @@
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
 $_['text_mollie_inghomepay']    = $method_list_logo;
+$_['text_mollie_eps']           = $method_list_logo;
+$_['text_mollie_giropay']       = $method_list_logo;
 
 // Heading
 $_['heading_title']           = "Mollie";
@@ -68,6 +70,8 @@
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
 $_['name_mollie_inghomepay']    = 'ING Home\'pay';
+$_['name_mollie_eps']           = 'EPS';
+$_['name_mollie_giropay']       = 'Giropay';
 
 // Text
 $_['text_edit']                    = "Éditer Mollie";
diff --git a/admin/language/french/extension/payment/mollie_eps.php b/admin/language/french/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..5cff1aab
--- /dev/null
+++ b/admin/language/french/extension/payment/mollie_eps.php
@@ -0,0 +1,4 @@
+
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_eps'];
diff --git a/admin/language/french/extension/payment/mollie_giropay.php b/admin/language/french/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..7f6b6f4b
--- /dev/null
+++ b/admin/language/french/extension/payment/mollie_giropay.php
@@ -0,0 +1,4 @@
+
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_giropay'];
diff --git a/admin/language/nl-nl/extension/payment/mollie.php b/admin/language/nl-nl/extension/payment/mollie.php
index b5ec8954..276d6450 100644
--- a/admin/language/nl-nl/extension/payment/mollie.php
+++ b/admin/language/nl-nl/extension/payment/mollie.php
@@ -46,6 +46,8 @@
 $_['text_mollie_sofort']        = $method_list_logo;
 $_['text_mollie_giftcard']      = $method_list_logo;
 $_['text_mollie_inghomepay']    = $method_list_logo;
+$_['text_mollie_eps']           = $method_list_logo;
+$_['text_mollie_giropay']       = $method_list_logo;
 
 // Heading
 $_['heading_title']         = "Mollie";
@@ -68,6 +70,8 @@
 $_['name_mollie_sofort']        = "SOFORT Banking";
 $_['name_mollie_giftcard']      = 'Giftcard';
 $_['name_mollie_inghomepay']    = 'ING Home\'pay';
+$_['name_mollie_eps']           = 'EPS';
+$_['name_mollie_giropay']       = 'Giropay';
 
 // Text
 $_['text_edit']                    = "Bewerk Mollie";
diff --git a/admin/language/nl-nl/extension/payment/mollie_eps.php b/admin/language/nl-nl/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..74c69006
--- /dev/null
+++ b/admin/language/nl-nl/extension/payment/mollie_eps.php
@@ -0,0 +1,3 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_eps'];
diff --git a/admin/language/nl-nl/extension/payment/mollie_giropay.php b/admin/language/nl-nl/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..8e1a5855
--- /dev/null
+++ b/admin/language/nl-nl/extension/payment/mollie_giropay.php
@@ -0,0 +1,3 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_giropay'];
diff --git a/catalog/controller/extension/payment/mollie/helper.php b/catalog/controller/extension/payment/mollie/helper.php
index bb8da285..b2c46eac 100644
--- a/catalog/controller/extension/payment/mollie/helper.php
+++ b/catalog/controller/extension/payment/mollie/helper.php
@@ -1,7 +1,7 @@
 <?php
 class MollieHelper
 {
-	const PLUGIN_VERSION = "8.3.2";
+	const PLUGIN_VERSION = "8.4.0";
 
 	// All available modules. These should correspond to the Mollie_API_Object_Method constants.
 	const MODULE_NAME_BANKTRANSFER  = "banktransfer";
@@ -17,6 +17,8 @@ class MollieHelper
 	const MODULE_NAME_KBC           = "kbc";
 	const MODULE_NAME_GIFTCARD      = "giftcard";
 	const MODULE_NAME_INGHOMEPAY    = "inghomepay";
+	const MODULE_NAME_EPS           = "eps";
+	const MODULE_NAME_GIROPAY       = "giropay";
 
 
 	// List of all available module names.
@@ -33,7 +35,9 @@ class MollieHelper
 		self::MODULE_NAME_SOFORT,
 		self::MODULE_NAME_KBC,
 		self::MODULE_NAME_GIFTCARD,
-		self::MODULE_NAME_INGHOMEPAY
+		self::MODULE_NAME_INGHOMEPAY,
+		self::MODULE_NAME_EPS,
+		self::MODULE_NAME_GIROPAY
 	);
 
 	static protected $api_client;
diff --git a/catalog/controller/extension/payment/mollie_eps.php b/catalog/controller/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..9dce5d50
--- /dev/null
+++ b/catalog/controller/extension/payment/mollie_eps.php
@@ -0,0 +1,6 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+class ControllerExtensionPaymentMollieEps extends ControllerExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_EPS;
+}
diff --git a/catalog/controller/extension/payment/mollie_giropay.php b/catalog/controller/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..b8bc6dc1
--- /dev/null
+++ b/catalog/controller/extension/payment/mollie_giropay.php
@@ -0,0 +1,6 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+class ControllerExtensionPaymentMollieGiropay extends ControllerExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_GIROPAY;
+}
diff --git a/catalog/language/dutch/extension/payment/mollie.php b/catalog/language/dutch/extension/payment/mollie.php
index f730c13e..c1c3153a 100644
--- a/catalog/language/dutch/extension/payment/mollie.php
+++ b/catalog/language/dutch/extension/payment/mollie.php
@@ -79,3 +79,5 @@
 $_['method_paysafecard']                = 'paysafecard';
 $_['method_giftcard']                   = 'Giftcard';
 $_['method_inghomepay']                 = 'ING Home\'Pay';
+$_['method_eps']                        = 'Giropay';
+$_['method_giropay']                    = 'EPS';
diff --git a/catalog/language/en-gb/extension/payment/mollie.php b/catalog/language/en-gb/extension/payment/mollie.php
index 82dbf60c..0814246c 100644
--- a/catalog/language/en-gb/extension/payment/mollie.php
+++ b/catalog/language/en-gb/extension/payment/mollie.php
@@ -79,3 +79,5 @@
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Giftcard';
 $_['method_inghomepay']   = 'ING Home\'Pay';
+$_['method_eps']          = 'Giropay';
+$_['method_giropay']      = 'EPS';
diff --git a/catalog/language/english/extension/payment/mollie.php b/catalog/language/english/extension/payment/mollie.php
index b40801b5..d7795e89 100644
--- a/catalog/language/english/extension/payment/mollie.php
+++ b/catalog/language/english/extension/payment/mollie.php
@@ -79,3 +79,5 @@
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Webshop Giftcard';
 $_['method_inghomepay']   = 'ING Home\'Pay';
+$_['method_eps']          = 'Giropay';
+$_['method_giropay']      = 'EPS';
diff --git a/catalog/language/fr-fr/extension/payment/mollie.php b/catalog/language/fr-fr/extension/payment/mollie.php
index 6027c239..8b73eaae 100644
--- a/catalog/language/fr-fr/extension/payment/mollie.php
+++ b/catalog/language/fr-fr/extension/payment/mollie.php
@@ -78,4 +78,6 @@
 $_['method_paypal']                     = 'PayPal';
 $_['method_paysafecard']                = 'paysafecard';
 $_['method_giftcard']                   = 'Giftcard';
-$_['method_inghomepay']   = 'ING Home\'Pay';
+$_['method_inghomepay']                 = 'ING Home\'Pay';
+$_['method_eps']                        = 'Giropay';
+$_['method_giropay']                    = 'EPS';
diff --git a/catalog/language/french/extension/payment/mollie.php b/catalog/language/french/extension/payment/mollie.php
index 1bae1bf8..014a83ba 100644
--- a/catalog/language/french/extension/payment/mollie.php
+++ b/catalog/language/french/extension/payment/mollie.php
@@ -79,3 +79,5 @@
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Giftcard';
 $_['method_inghomepay']   = 'ING Home\'Pay';
+$_['method_eps']          = 'Giropay';
+$_['method_giropay']      = 'EPS';
diff --git a/catalog/language/nl-nl/extension/payment/mollie.php b/catalog/language/nl-nl/extension/payment/mollie.php
index 2ff554b7..9d2a3355 100644
--- a/catalog/language/nl-nl/extension/payment/mollie.php
+++ b/catalog/language/nl-nl/extension/payment/mollie.php
@@ -79,3 +79,5 @@
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Giftcard';
 $_['method_inghomepay']   = 'ING Home\'Pay';
+$_['method_eps']          = 'Giropay';
+$_['method_giropay']      = 'EPS';
diff --git a/catalog/model/extension/payment/mollie_eps.php b/catalog/model/extension/payment/mollie_eps.php
new file mode 100644
index 00000000..72c2842c
--- /dev/null
+++ b/catalog/model/extension/payment/mollie_eps.php
@@ -0,0 +1,6 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+class ModelExtensionPaymentMollieEPS extends ModelExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_EPS;
+}
diff --git a/catalog/model/extension/payment/mollie_giropay.php b/catalog/model/extension/payment/mollie_giropay.php
new file mode 100644
index 00000000..c0565db6
--- /dev/null
+++ b/catalog/model/extension/payment/mollie_giropay.php
@@ -0,0 +1,6 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+class ModelExtensionPaymentMollieGIROPAY extends ModelExtensionPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_GIROPAY;
+}