diff --git a/packages/nodes-base/credentials/Postgres.credentials.ts b/packages/nodes-base/credentials/Postgres.credentials.ts
new file mode 100644
index 0000000000..c99a7aa722
--- /dev/null
+++ b/packages/nodes-base/credentials/Postgres.credentials.ts
@@ -0,0 +1,45 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+
+export class Postgres implements ICredentialType {
+	name = 'postgres';
+	displayName = 'Postgres';
+	properties = [
+		{
+			displayName: 'Host',
+			name: 'host',
+			type: 'string' as NodePropertyTypes,
+			default: 'localhost',
+		},
+		{
+			displayName: 'Database',
+			name: 'database',
+			type: 'string' as NodePropertyTypes,
+			default: 'postgres',
+		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'string' as NodePropertyTypes,
+			default: 'postgres',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string' as NodePropertyTypes,
+			typeOptions: {
+				password: true,
+			},
+			default: '',
+		},
+		{
+			displayName: 'Port',
+			name: 'port',
+			type: 'number' as NodePropertyTypes,
+			default: 5432,
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
new file mode 100644
index 0000000000..e4c5ca8252
--- /dev/null
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -0,0 +1,290 @@
+import { IExecuteFunctions } from 'n8n-core';
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import * as pgPromise from 'pg-promise';
+
+
+/**
+ * Returns of copy of the items which only contains the json data and
+ * of that only the define properties
+ *
+ * @param {INodeExecutionData[]} items The items to copy
+ * @param {string[]} properties The properties it should include
+ * @returns
+ */
+function getItemCopy(items: INodeExecutionData[], properties: string[]): IDataObject[] {
+	// Prepare the data to insert and copy it to be returned
+	let newItem: IDataObject;
+	return items.map((item) => {
+		newItem = {};
+		for (const property of properties) {
+			if (item.json[property] === undefined) {
+				newItem[property] = null;
+			} else {
+				newItem[property] = JSON.parse(JSON.stringify(item.json[property]));
+			}
+		}
+		return newItem;
+	});
+}
+
+
+export class Postgres implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Postgres',
+		name: 'postgres',
+		icon: 'file:postgres.png',
+		group: ['input'],
+		version: 1,
+		description: 'Gets, add and update data in Postgres.',
+		defaults: {
+			name: 'Postgres',
+			color: '#336791',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'postgres',
+				required: true,
+			}
+		],
+		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [
+					{
+						name: 'Execute Query',
+						value: 'executeQuery',
+						description: 'Executes a SQL query.',
+					},
+					{
+						name: 'Insert',
+						value: 'insert',
+						description: 'Insert rows in database.',
+					},
+					{
+						name: 'Update',
+						value: 'update',
+						description: 'Updates rows in database.',
+					},
+				],
+				default: 'insert',
+				description: 'The operation to perform.',
+			},
+
+			// ----------------------------------
+			//         executeQuery
+			// ----------------------------------
+			{
+				displayName: 'Query',
+				name: 'query',
+				type: 'string',
+				typeOptions: {
+					rows: 5,
+				},
+				displayOptions: {
+					show: {
+						operation: [
+							'executeQuery'
+						],
+					},
+				},
+				default: '',
+				placeholder: 'SELECT id, name FROM product WHERE id < 40',
+				required: true,
+				description: 'The SQL query to execute.',
+			},
+
+
+			// ----------------------------------
+			//         insert
+			// ----------------------------------
+			{
+				displayName: 'Table',
+				name: 'table',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: [
+							'insert'
+						],
+					},
+				},
+				default: '',
+				required: true,
+				description: 'Name of the table in which to insert data to.',
+			},
+			{
+				displayName: 'Columns',
+				name: 'columns',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: [
+							'insert'
+						],
+					},
+				},
+				default: '',
+				placeholder: 'id,name,description',
+				description: 'Comma separated list of the properties which should used as columns for the new rows.',
+			},
+
+
+			// ----------------------------------
+			//         update
+			// ----------------------------------
+			{
+				displayName: 'Table',
+				name: 'table',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: [
+							'update'
+						],
+					},
+				},
+				default: '',
+				required: true,
+				description: 'Name of the table in which to update data in',
+			},
+			{
+				displayName: 'Update Key',
+				name: 'updateKey',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: [
+							'update'
+						],
+					},
+				},
+				default: 'id',
+				required: true,
+				description: 'Name of the property which decides which rows in the database should be updated. Normally that would be "id".',
+			},
+			{
+				displayName: 'Columns',
+				name: 'columns',
+				type: 'string',
+				displayOptions: {
+					show: {
+						operation: [
+							'update'
+						],
+					},
+				},
+				default: '',
+				placeholder: 'name,description',
+				description: 'Comma separated list of the properties which should used as columns for rows to update.',
+			},
+
+		]
+	};
+
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+
+		const credentials = this.getCredentials('postgres');
+
+		if (credentials === undefined) {
+			throw new Error('No credentials got returned!');
+		}
+
+		const pgp = pgPromise();
+
+		const db = pgp(`postgres://${credentials.user}:${credentials.password}@${credentials.host}:${credentials.port}/${credentials.database}`);
+
+		let returnItems = [];
+
+		const items = this.getInputData();
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		if (operation === 'executeQuery') {
+			// ----------------------------------
+			//         executeQuery
+			// ----------------------------------
+
+			const queries: string[] = [];
+			for (let i = 0; i < items.length; i++) {
+				queries.push(this.getNodeParameter('query', i) as string);
+			}
+
+			const queryResult = await db.any(pgp.helpers.concat(queries));
+
+			returnItems = this.helpers.returnJsonArray(queryResult as IDataObject[]);
+
+		} else if (operation === 'insert') {
+			// ----------------------------------
+			//         insert
+			// ----------------------------------
+
+			const table = this.getNodeParameter('table', 0) as string;
+			const columnString = this.getNodeParameter('columns', 0) as string;
+
+			const columns = columnString.split(',').map(column => column.trim());
+
+			const cs = new pgp.helpers.ColumnSet(columns, { table });
+
+			// Prepare the data to insert and copy it to be returned
+			const insertItems = getItemCopy(items, columns);
+
+			// Generate the multi-row insert query and return the id of new row
+			const query = pgp.helpers.insert(insertItems, cs) + ' RETURNING id';
+
+			// Executing the query to insert the data
+			const insertData = await db.many(query);
+
+			// Add the id to the data
+			for (let i = 0; i < insertData.length; i++) {
+				returnItems.push({
+					json: {
+						...insertData[i],
+						...insertItems[i],
+					}
+				});
+			}
+
+		} else if (operation === 'update') {
+			// ----------------------------------
+			//         update
+			// ----------------------------------
+
+			const table = this.getNodeParameter('table', 0) as string;
+			const updateKey = this.getNodeParameter('updateKey', 0) as string;
+			const columnString = this.getNodeParameter('columns', 0) as string;
+
+			const columns = columnString.split(',').map(column => column.trim());
+
+			// Make sure that the updateKey does also get queried
+			if (!columns.includes(updateKey)) {
+				columns.unshift(updateKey);
+			}
+
+			// Prepare the data to update and copy it to be returned
+			const updateItems = getItemCopy(items, columns);
+
+			// Generate the multi-row update query
+			const query = pgp.helpers.update(updateItems, columns, table) + ' WHERE v.' + updateKey + ' = t.' + updateKey;
+
+			// Executing the query to update the data
+			await db.none(query);
+
+			returnItems = this.helpers.returnJsonArray(updateItems	 as IDataObject[]);
+
+		} else {
+			throw new Error(`The operation "${operation}" is not supported!`);
+		}
+
+		return this.prepareOutputData(returnItems);
+	}
+}
diff --git a/packages/nodes-base/nodes/Postgres/postgres.png b/packages/nodes-base/nodes/Postgres/postgres.png
new file mode 100644
index 0000000000..704a6f22f4
Binary files /dev/null and b/packages/nodes-base/nodes/Postgres/postgres.png differ
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index a57403a323..ed9728d9fd 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -40,6 +40,7 @@
             "dist/credentials/NextCloudApi.credentials.js",
             "dist/credentials/OpenWeatherMapApi.credentials.js",
             "dist/credentials/PipedriveApi.credentials.js",
+            "dist/credentials/Postgres.credentials.js",
             "dist/credentials/Redis.credentials.js",
             "dist/credentials/SlackApi.credentials.js",
             "dist/credentials/Smtp.credentials.js",
@@ -76,6 +77,7 @@
             "dist/nodes/OpenWeatherMap.node.js",
             "dist/nodes/Pipedrive/Pipedrive.node.js",
             "dist/nodes/Pipedrive/PipedriveTrigger.node.js",
+            "dist/nodes/Postgres/Postgres.node.js",
             "dist/nodes/ReadBinaryFile.node.js",
             "dist/nodes/ReadBinaryFiles.node.js",
             "dist/nodes/Redis/Redis.node.js",
@@ -128,6 +130,7 @@
         "n8n-core": "^0.8.0",
         "nodemailer": "^5.1.1",
         "pdf-parse": "^1.1.1",
+        "pg-promise": "^9.0.3",
         "redis": "^2.8.0",
         "rss-parser": "^3.7.0",
         "vm2": "^3.6.10",